pmatos updated this revision to Diff 342729. pmatos added a comment. Removed extraneous changes to previous patches
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D95425/new/ https://reviews.llvm.org/D95425 Files: clang/lib/Basic/Targets/WebAssembly.cpp llvm/include/llvm/CodeGen/TargetLowering.h llvm/include/llvm/CodeGen/ValueTypes.h llvm/include/llvm/Support/MachineValueType.h llvm/lib/CodeGen/CodeGenPrepare.cpp llvm/lib/CodeGen/MachineOperand.cpp llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp llvm/lib/CodeGen/TargetLoweringBase.cpp llvm/lib/CodeGen/ValueTypes.cpp llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.cpp llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.h llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp llvm/lib/Target/WebAssembly/WebAssemblyISD.def llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h llvm/lib/Target/WebAssembly/WebAssemblyInstrTable.td llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp llvm/test/CodeGen/WebAssembly/externref-globalget.ll llvm/test/CodeGen/WebAssembly/externref-globalset.ll llvm/test/CodeGen/WebAssembly/externref-inttoptr.ll llvm/test/CodeGen/WebAssembly/externref-ptrtoint.ll llvm/test/CodeGen/WebAssembly/externref-undef.ll llvm/test/CodeGen/WebAssembly/externref-unsized-load.ll llvm/test/CodeGen/WebAssembly/externref-unsized-store.ll llvm/test/CodeGen/WebAssembly/funcref-call.ll llvm/test/CodeGen/WebAssembly/funcref-globalget.ll llvm/test/CodeGen/WebAssembly/funcref-globalset.ll
Index: llvm/test/CodeGen/WebAssembly/funcref-globalset.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/funcref-globalset.ll @@ -0,0 +1,20 @@ +; RUN: llc < %s --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types | FileCheck %s + +%func = type opaque +%funcref = type %func addrspace(20)* ;; addrspace 20 is nonintegral + +@funcref_global = local_unnamed_addr addrspace(1) global %funcref undef + +define void @set_funcref_global(%funcref %g) { + ;; this generates a global.set of @funcref_global + store %funcref %g, %funcref addrspace(1)* @funcref_global + ret void +} + +; CHECK-LABEL: set_funcref_global: +; CHECK-NEXT: functype set_funcref_global (funcref) -> () +; CHECK-NEXT: local.get 0 +; CHECK-NEXT: global.set funcref_global +; CHECK-NEXT: end_function + +; CHECK: .globl funcref_global Index: llvm/test/CodeGen/WebAssembly/funcref-globalget.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/funcref-globalget.ll @@ -0,0 +1,19 @@ +; RUN: llc < %s --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types | FileCheck %s + +%func = type opaque +%funcref = type %func addrspace(20)* ;; addrspace 20 is nonintegral + +@funcref_global = local_unnamed_addr addrspace(1) global %funcref undef + +define %funcref @return_funcref_global() { + ;; this generates a global.get of @funcref_global + %ref = load %funcref, %funcref addrspace(1)* @funcref_global + ret %funcref %ref +} + +; CHECK-LABEL: return_funcref_global: +; CHECK-NEXT: .functype return_funcref_global () -> (funcref) +; CHECK-NEXT: global.get funcref_global +; CHECK-NEXT: end_function + +; CHECK: .globl funcref_global Index: llvm/test/CodeGen/WebAssembly/funcref-call.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/funcref-call.ll @@ -0,0 +1,23 @@ +; RUN: llc < %s --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types | FileCheck %s + +%func = type void () +%funcref = type %func addrspace(20)* ;; addrspace 20 is nonintegral + +define void @call_funcref(%funcref %ref) { + call addrspace(20) void %ref() + ret void +} + +; CHECK-LABEL: call_funcref: +; CHECK-NEXT: functype call_funcref (funcref) -> () +; CHECK-NEXT: i32.const 0 +; CHECK-NEXT: local.get 0 +; CHECK-NEXT: table.set __funcref_call_table +; CHECK-NEXT: local.get 0 +; CHECK-NEXT: call_indirect __funcref_call_table, () -> () +; CHECK-NEXT: i32.const 0 +; CHECK-NEXT: ref.null func +; CHECK-NEXT: table.set __funcref_call_table +; CHECK-NEXT: end_function + +; CHECK: .tabletype __funcref_call_table, funcref Index: llvm/test/CodeGen/WebAssembly/externref-unsized-store.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-unsized-store.ll @@ -0,0 +1,11 @@ +; RUN: not llc --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +%extern = type opaque +%externref = type %extern addrspace(10)* + +define void @store_extern(%externref %ref) { + store %extern undef, %externref %ref + ret void +} + +; CHECK-ERROR: error: storing unsized types is not allowed Index: llvm/test/CodeGen/WebAssembly/externref-unsized-load.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-unsized-load.ll @@ -0,0 +1,11 @@ +; RUN: not llc --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +%extern = type opaque +%externref = type %extern addrspace(10)* + +define void @load_extern(%externref %ref) { + %e = load %extern, %externref %ref + ret void +} + +; CHECK-ERROR: error: loading unsized types is not allowed Index: llvm/test/CodeGen/WebAssembly/externref-undef.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-undef.ll @@ -0,0 +1,17 @@ +; RUN: llc < %s --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types | FileCheck %s + +%extern = type opaque +%externref = type %extern addrspace(10)* ;; addrspace 1 is nonintegral + +@externref_global = local_unnamed_addr addrspace(1) global %externref undef + +define %extern @return_extern_undef() { + ret %extern undef +} + +; CHECK-LABEL: return_extern_undef: +; CHECK-NEXT: functype return_extern_undef () -> () +; CHECK-NEXT: end_function + +; CHECK: .globl externref_global + Index: llvm/test/CodeGen/WebAssembly/externref-ptrtoint.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-ptrtoint.ll @@ -0,0 +1,11 @@ +; RUN: not llc --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +%extern = type opaque +%externref = type %extern addrspace(10)* + +define i32 @externref_to_int(%externref %ref) { + %i = ptrtoint %externref %ref to i32 + ret i32 %i +} + +; CHECK-ERROR: ptrtoint not supported for non-integral pointers Index: llvm/test/CodeGen/WebAssembly/externref-inttoptr.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-inttoptr.ll @@ -0,0 +1,11 @@ +; RUN: not llc --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types < %s 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR + +%extern = type opaque +%externref = type %extern addrspace(10)* + +define %externref @int_to_externref(i32 %i) { + %ref = inttoptr i32 %i to %externref + ret %externref %ref +} + +; CHECK-ERROR: inttoptr not supported for non-integral pointers Index: llvm/test/CodeGen/WebAssembly/externref-globalset.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-globalset.ll @@ -0,0 +1,20 @@ +; RUN: llc --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types < %s | FileCheck %s + +%extern = type opaque +%externref = type %extern addrspace(10)* ;; addrspace 1 is nonintegral + +@externref_global = local_unnamed_addr addrspace(1) global %externref undef + +define void @set_externref_global(%externref %g) { + ;; this generates a global.set of @externref.global + store %externref %g, %externref addrspace(1)* @externref_global + ret void +} + +; CHECK-LABEL: set_externref_global: +; CHECK-NEXT: functype set_externref_global (externref) -> () +; CHECK-NEXT: local.get 0 +; CHECK-NEXT: global.set externref_global +; CHECK-NEXT: end_function + +; CHECK: .globl externref_global Index: llvm/test/CodeGen/WebAssembly/externref-globalget.ll =================================================================== --- /dev/null +++ llvm/test/CodeGen/WebAssembly/externref-globalget.ll @@ -0,0 +1,19 @@ +; RUN: llc < %s --mtriple=wasm32-unknown-unknown -asm-verbose=false -mattr=+reference-types | FileCheck %s + +%extern = type opaque +%externref = type %extern addrspace(10)* ;; addrspace 10 is nonintegral + +@externref_global = local_unnamed_addr addrspace(1) global %externref undef + +define %externref @return_externref_global() { + ;; this generates a global.get of @externref_global + %ref = load %externref, %externref addrspace(1)* @externref_global + ret %externref %ref +} + +; CHECK-LABEL: return_externref_global: +; CHECK-NEXT: functype return_externref_global () -> (externref) +; CHECK-NEXT: global.get externref_global +; CHECK-NEXT: end_function + +; CHECK: .globl externref_global Index: llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp +++ llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp @@ -112,6 +112,12 @@ return *RM; } +// Check for reference types in Feature String, in order to extend target +// description string +static bool hasReferenceTypes(const StringRef &FS) { + return FS.find("+reference-types") != StringRef::npos; +} + /// Create an WebAssembly architecture model. /// WebAssemblyTargetMachine::WebAssemblyTargetMachine( @@ -120,8 +126,12 @@ Optional<CodeModel::Model> CM, CodeGenOpt::Level OL, bool JIT) : LLVMTargetMachine(T, TT.isArch64Bit() - ? "e-m:e-p:64:64-i64:64-n32:64-S128-ni:1" - : "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1", + ? (hasReferenceTypes(FS) + ? "e-m:e-p:64:64-i64:64-n32:64-S128-ni:1:10:20" + : "e-m:e-p:64:64-i64:64-n32:64-S128-ni:1") + : (hasReferenceTypes(FS) + ? "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1:10:20" + : "e-m:e-p:32:32-i64:64-n32:64-S128-ni:1"), TT, CPU, FS, Options, getEffectiveRelocModel(RM, TT), getEffectiveCodeModel(CM, CodeModel::Large), OL), TLOF(new WebAssemblyTargetObjectFile()) { Index: llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp +++ llvm/lib/Target/WebAssembly/WebAssemblyMCInstLower.cpp @@ -198,6 +198,10 @@ return wasm::ValType::F64; if (RC == &WebAssembly::V128RegClass) return wasm::ValType::V128; + if (RC == &WebAssembly::EXTERNREFRegClass) + return wasm::ValType::EXTERNREF; + if (RC == &WebAssembly::FUNCREFRegClass) + return wasm::ValType::FUNCREF; llvm_unreachable("Unexpected register class"); } Index: llvm/lib/Target/WebAssembly/WebAssemblyInstrTable.td =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyInstrTable.td +++ llvm/lib/Target/WebAssembly/WebAssemblyInstrTable.td @@ -11,8 +11,8 @@ /// Instructions that handle tables //===----------------------------------------------------------------------===// - multiclass TABLE<WebAssemblyRegClass rt> { + let mayLoad = 1 in defm TABLE_GET_#rt : I<(outs rt:$res), (ins table32_op:$table), (outs), (ins table32_op:$table), [], @@ -20,6 +20,7 @@ "table.get\t$table", 0x25>; + let mayStore = 1 in defm TABLE_SET_#rt : I<(outs), (ins table32_op:$table, I32:$i, rt:$val), (outs), (ins table32_op:$table), [], @@ -46,6 +47,17 @@ defm "" : TABLE<FUNCREF>, Requires<[HasReferenceTypes]>; defm "" : TABLE<EXTERNREF>, Requires<[HasReferenceTypes]>; +def wasm_table_set_t : SDTypeProfile<0, 3, []>; +def wasm_table_set : SDNode<"WebAssemblyISD::TABLE_SET", wasm_table_set_t, + [SDNPHasChain, SDNPMayStore, SDNPMemOperand]>; + +def : Pat<(wasm_table_set i32:$table, i32:$idx, funcref:$r), + (TABLE_SET_FUNCREF i32:$table, i32:$idx, funcref:$r)>, + Requires<[HasReferenceTypes]>; +def : Pat<(wasm_table_set i32:$table, i32:$idx, externref:$r), + (TABLE_SET_EXTERNREF i32:$table, i32:$idx, externref:$r)>, + Requires<[HasReferenceTypes]>; + defm TABLE_SIZE : I<(outs I32:$sz), (ins table32_op:$table), (outs), (ins table32_op:$table), [], Index: llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h +++ llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h @@ -45,14 +45,33 @@ WebAssemblyTargetLowering(const TargetMachine &TM, const WebAssemblySubtarget &STI); - enum WasmAddressSpace { + enum WasmAddressSpace : unsigned { // WebAssembly uses the following address spaces: // AS 0 : is the default address space for values in linear memory DEFAULT = 0, // AS 1 : is a non-integral address space for global variables GLOBAL = 1, + // AS 10 : is a non-integral address space for externref values + EXTERNREF = 10, + // AS 20 : is a non-integral address space for funcref values + FUNCREF = 20, }; + MVT getPointerTy(const DataLayout &DL, uint32_t AS = 0) const override { + if (AS == WasmAddressSpace::EXTERNREF) + return MVT::externref; + else if (AS == WasmAddressSpace::FUNCREF) + return MVT::funcref; + return TargetLowering::getPointerTy(DL, AS); + } + MVT getPointerMemTy(const DataLayout &DL, uint32_t AS = 0) const override { + if (AS == WasmAddressSpace::EXTERNREF) + return MVT::externref; + else if (AS == WasmAddressSpace::FUNCREF) + return MVT::funcref; + return TargetLowering::getPointerMemTy(DL, AS); + } + private: /// Keep a pointer to the WebAssemblySubtarget around so that we can make the /// right decision when generating code for different targets. @@ -74,6 +93,7 @@ bool isLegalAddressingMode(const DataLayout &DL, const AddrMode &AM, Type *Ty, unsigned AS, Instruction *I = nullptr) const override; + bool isFuncref(const Value *Op) const; bool allowsMisalignedMemoryAccesses(EVT, unsigned AddrSpace, Align Alignment, MachineMemOperand::Flags Flags, bool *Fast) const override; @@ -108,6 +128,11 @@ report_fatal_error("llvm.clear_cache is not supported on wasm"); } + bool splitValueIntoRegisterParts(SelectionDAG &DAG, const SDLoc &DL, + SDValue Val, SDValue *Parts, + unsigned NumParts, MVT PartVT, + Optional<CallingConv::ID> CC) const override; + // Custom lowering hooks. SDValue LowerOperation(SDValue Op, SelectionDAG &DAG) const override; SDValue LowerFrameIndex(SDValue Op, SelectionDAG &DAG) const; Index: llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp +++ llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp @@ -14,6 +14,7 @@ #include "WebAssemblyISelLowering.h" #include "MCTargetDesc/WebAssemblyMCTargetDesc.h" #include "Utils/WebAssemblyUtilities.h" +#include "Utils/WebAssemblyTypeUtilities.h" #include "WebAssemblyMachineFunctionInfo.h" #include "WebAssemblySubtarget.h" #include "WebAssemblyTargetMachine.h" @@ -67,6 +68,10 @@ addRegisterClass(MVT::v2i64, &WebAssembly::V128RegClass); addRegisterClass(MVT::v2f64, &WebAssembly::V128RegClass); } + if (Subtarget->hasReferenceTypes()) { + addRegisterClass(MVT::externref, &WebAssembly::EXTERNREFRegClass); + addRegisterClass(MVT::funcref, &WebAssembly::FUNCREFRegClass); + } // Compute derived properties from the register classes. computeRegisterProperties(Subtarget->getRegisterInfo()); @@ -83,6 +88,12 @@ setOperationAction(ISD::STORE, T, Custom); } } + if (Subtarget->hasReferenceTypes()) { + for (auto T : {MVT::externref, MVT::funcref}) { + setOperationAction(ISD::LOAD, T, Custom); + setOperationAction(ISD::STORE, T, Custom); + } + } setOperationAction(ISD::GlobalAddress, MVTPtr, Custom); setOperationAction(ISD::GlobalTLSAddress, MVTPtr, Custom); @@ -469,6 +480,16 @@ bool IsIndirect = CallParams.getOperand(0).isReg(); bool IsRetCall = CallResults.getOpcode() == WebAssembly::RET_CALL_RESULTS; + bool IsFuncrefCall = false; + if (IsIndirect) { + Register Reg = CallParams.getOperand(0).getReg(); + const MachineFunction *MF = BB->getParent(); + const MachineRegisterInfo &MRI = MF->getRegInfo(); + const TargetRegisterClass *TRC = MRI.getRegClass(Reg); + IsFuncrefCall = (TRC == &WebAssembly::FUNCREFRegClass); + assert(!IsFuncrefCall || Subtarget->hasReferenceTypes()); + } + unsigned CallOp; if (IsIndirect && IsRetCall) { CallOp = WebAssembly::RET_CALL_INDIRECT; @@ -512,8 +533,11 @@ // Placeholder for the type index. MIB.addImm(0); // The table into which this call_indirect indexes. - MCSymbolWasm *Table = - WebAssembly::getOrCreateFunctionTableSymbol(MF.getContext(), Subtarget); + MCSymbolWasm *Table = IsFuncrefCall + ? WebAssembly::getOrCreateFuncrefCallTableSymbol( + MF.getContext(), Subtarget) + : WebAssembly::getOrCreateFunctionTableSymbol( + MF.getContext(), Subtarget); if (Subtarget->hasReferenceTypes()) { MIB.addSym(Table); } else { @@ -532,6 +556,27 @@ CallParams.eraseFromParent(); CallResults.eraseFromParent(); + // If this is a funcref call, to avoid hidden GC roots, we need to clear the table + // slot with ref.null upon call_indirect return. + if (IsIndirect && IsFuncrefCall) { + MCSymbolWasm *Table = WebAssembly::getOrCreateFuncrefCallTableSymbol(MF.getContext(), Subtarget); + Register RegZero = + MF.getRegInfo().createVirtualRegister(&WebAssembly::I32RegClass); + MachineInstr *Const0 = BuildMI(MF, DL, TII.get(WebAssembly::CONST_I32), RegZero) + .addImm(0); + BB->insertAfter(MIB.getInstr()->getIterator(), Const0); + + Register RegFuncref = + MF.getRegInfo().createVirtualRegister(&WebAssembly::FUNCREFRegClass); + MachineInstr *RefNull = BuildMI(MF, DL, TII.get(WebAssembly::REF_NULL_FUNCREF), RegFuncref) + .addImm(static_cast<int32_t>(WebAssembly::HeapType::Funcref)); + BB->insertAfter(Const0->getIterator(), RefNull); + + MachineInstr *TableSet = BuildMI(MF, DL, TII.get(WebAssembly::TABLE_SET_FUNCREF)) + .addSym(Table).addReg(RegZero).addReg(RegFuncref); + BB->insertAfter(RefNull->getIterator(), TableSet); + } + return BB; } @@ -1060,6 +1105,33 @@ InTys.push_back(In.VT); } + // Lastly, if this is a call to a funcref we need to add an instruction + // table.set to the chain and transform the call. + if (CLI.CB && isFuncref(CLI.CB->getCalledOperand())) { + // In the absence of function references proposal where a funcref call is + // lowered to call_ref, using reference types we generate a table.set to set + // the funcref to a special table used solely for this purpose, followed by + // a call_indirect. Here we just generate the table set, and return the + // SDValue of the table.set so that LowerCall can finalize the lowering by + // generating the call_indirect. + SDValue Chain = Ops[0]; + + MCSymbolWasm *Table = WebAssembly::getOrCreateFuncrefCallTableSymbol( + MF.getContext(), Subtarget); + SDValue Sym = DAG.getMCSymbol(Table, PtrVT); + SDValue TableSlot = DAG.getConstant(0, DL, MVT::i32); + SDValue TableSetOps[] = {Chain, Sym, TableSlot, Callee}; + SDValue TableSet = DAG.getMemIntrinsicNode( + WebAssemblyISD::TABLE_SET, DL, DAG.getVTList(MVT::Other), TableSetOps, + MVT::funcref, + // Machine Mem Operand args + MachinePointerInfo(WasmAddressSpace::FUNCREF), + CLI.CB->getCalledOperand()->getPointerAlignment(DAG.getDataLayout()), + MachineMemOperand::MOStore); + + Ops[0] = TableSet; // The new chain is the TableSet itself + } + if (CLI.IsTailCall) { // ret_calls do not return values to the current frame SDVTList NodeTys = DAG.getVTList(MVT::Other, MVT::Glue); @@ -1283,6 +1355,13 @@ return false; } +bool WebAssemblyTargetLowering::isFuncref(const Value *Op) const { + const Type *Ty = Op->getType(); + + return isa<PointerType>(Ty) && + Ty->getPointerAddressSpace() == WasmAddressSpace::FUNCREF; +} + SDValue WebAssemblyTargetLowering::LowerStore(SDValue Op, SelectionDAG &DAG) const { SDLoc DL(Op); @@ -2256,3 +2335,13 @@ return performVectorTruncSatLowCombine(N, DCI); } } + +bool WebAssemblyTargetLowering::splitValueIntoRegisterParts( + SelectionDAG &DAG, const SDLoc &DL, SDValue Val, SDValue *Parts, + unsigned NumParts, MVT PartVT, Optional<CallingConv::ID> CC) const { + if (PartVT.isZeroSized()) { + Parts[0] = Val; + return true; + } + return false; +} Index: llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp +++ llvm/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp @@ -60,6 +60,7 @@ bool SelectInlineAsmMemoryOperand(const SDValue &Op, unsigned ConstraintID, std::vector<SDValue> &OutOps) override; + bool SelectExternRefAddr(const SDValue &Addr, const SDValue &Base); // Include the pieces autogenerated from the target description. #include "WebAssemblyGenDAGISel.inc" Index: llvm/lib/Target/WebAssembly/WebAssemblyISD.def =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyISD.def +++ llvm/lib/Target/WebAssembly/WebAssemblyISD.def @@ -48,3 +48,4 @@ // Reference Types HANDLE_MEM_NODETYPE(GLOBAL_GET) HANDLE_MEM_NODETYPE(GLOBAL_SET) +HANDLE_MEM_NODETYPE(TABLE_SET) Index: llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp =================================================================== --- llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp +++ llvm/lib/Target/WebAssembly/WebAssemblyFastISel.cpp @@ -130,9 +130,12 @@ case MVT::i64: case MVT::f32: case MVT::f64: + return VT; case MVT::funcref: case MVT::externref: - return VT; + if (Subtarget->hasReferenceTypes()) + return VT; + break; case MVT::f16: return MVT::f32; case MVT::v16i8: Index: llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.h =================================================================== --- llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.h +++ llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.h @@ -48,6 +48,12 @@ getOrCreateFunctionTableSymbol(MCContext &Ctx, const WebAssemblySubtarget *Subtarget); +/// Returns the __funcref_call_table, for use in funcref calls when lowered to +/// table.set + call_indirect. +MCSymbolWasm * +getOrCreateFuncrefCallTableSymbol(MCContext &Ctx, + const WebAssemblySubtarget *Subtarget); + /// Find a catch instruction from an EH pad. Returns null if no catch /// instruction found or the catch is in an invalid location. MachineInstr *findCatch(MachineBasicBlock *EHPad); Index: llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.cpp =================================================================== --- llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.cpp +++ llvm/lib/Target/WebAssembly/Utils/WebAssemblyUtilities.cpp @@ -116,6 +116,34 @@ return Sym; } +MCSymbolWasm *WebAssembly::getOrCreateFuncrefCallTableSymbol( + MCContext &Ctx, const WebAssemblySubtarget *Subtarget) { + StringRef Name = "__funcref_call_table"; + MCSymbolWasm *Sym = cast_or_null<MCSymbolWasm>(Ctx.lookupSymbol(Name)); + if (Sym) { + if (!Sym->isFunctionTable()) + Ctx.reportError(SMLoc(), "symbol is not a wasm funcref table"); + } else { + Sym = cast<MCSymbolWasm>(Ctx.getOrCreateSymbol(Name)); + + // The default function table is synthesized by the linker. + Sym->setUndefined(); + + // Setting Comdat ensure only one table is left after linking when multiple + // modules define the table. + Sym->setComdat(true); + + wasm::WasmLimits Limits = {0, 1, 1}; + wasm::WasmTableType TableType = {wasm::WASM_TYPE_FUNCREF, Limits}; + Sym->setType(wasm::WASM_SYMBOL_TYPE_TABLE); + Sym->setTableType(TableType); + } + // MVP object files can't have symtab entries for tables. + if (!(Subtarget && Subtarget->hasReferenceTypes())) + Sym->setOmitFromLinkingSection(); + return Sym; +} + // Find a catch instruction from an EH pad. MachineInstr *WebAssembly::findCatch(MachineBasicBlock *EHPad) { assert(EHPad->isEHPad()); Index: llvm/lib/CodeGen/ValueTypes.cpp =================================================================== --- llvm/lib/CodeGen/ValueTypes.cpp +++ llvm/lib/CodeGen/ValueTypes.cpp @@ -199,6 +199,10 @@ case MVT::ppcf128: return Type::getPPC_FP128Ty(Context); case MVT::x86mmx: return Type::getX86_MMXTy(Context); case MVT::x86amx: return Type::getX86_AMXTy(Context); + case MVT::externref: + return PointerType::get(StructType::create(Context), 10); + case MVT::funcref: + return PointerType::get(StructType::create(Context), 20); case MVT::v1i1: return FixedVectorType::get(Type::getInt1Ty(Context), 1); case MVT::v2i1: Index: llvm/lib/CodeGen/TargetLoweringBase.cpp =================================================================== --- llvm/lib/CodeGen/TargetLoweringBase.cpp +++ llvm/lib/CodeGen/TargetLoweringBase.cpp @@ -1681,7 +1681,7 @@ // For example, the ABI alignment may change based on software platform while // this function should only be affected by hardware implementation. Type *Ty = VT.getTypeForEVT(Context); - if (Alignment >= DL.getABITypeAlign(Ty)) { + if (!VT.isZeroSized() && Alignment >= DL.getABITypeAlign(Ty)) { // Assume that an access that meets the ABI-specified alignment is fast. if (Fast != nullptr) *Fast = true; Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp =================================================================== --- llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp +++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp @@ -4080,6 +4080,7 @@ SmallVector<SDValue, 4> Values(NumValues); SmallVector<SDValue, 4> Chains(std::min(MaxParallelChains, NumValues)); EVT PtrVT = Ptr.getValueType(); + EVT EltVT = PtrVT.getScalarType(); MachineMemOperand::Flags MMOFlags = TLI.getLoadMemOperandFlags(I, DAG.getDataLayout()); @@ -4099,17 +4100,21 @@ Root = Chain; ChainI = 0; } - SDValue A = DAG.getNode(ISD::ADD, dl, - PtrVT, Ptr, - DAG.getConstant(Offsets[i], dl, PtrVT), - Flags); + SDValue A; + + if (EltVT.isZeroSized()) + A = Ptr; + else + A = DAG.getNode(ISD::ADD, dl, PtrVT, Ptr, + DAG.getConstant(Offsets[i], dl, PtrVT), Flags); SDValue L = DAG.getLoad(MemVTs[i], dl, Root, A, MachinePointerInfo(SV, Offsets[i]), Alignment, MMOFlags, AAInfo, Ranges); Chains[ChainI] = L.getValue(1); - if (MemVTs[i] != ValueVTs[i]) + // Skip ZExt or Trunc if a ValueVT is zero sized + if (!ValueVTs[i].isZeroSized() && MemVTs[i] != ValueVTs[i]) L = DAG.getZExtOrTrunc(L, dl, ValueVTs[i]); Values[i] = L; @@ -4248,7 +4253,8 @@ SDValue Add = DAG.getMemBasePlusOffset(Ptr, TypeSize::Fixed(Offsets[i]), dl, Flags); SDValue Val = SDValue(Src.getNode(), Src.getResNo() + i); - if (MemVTs[i] != ValueVTs[i]) + // Skip ZExt or Trunc if a ValueVT is zero sized + if (!ValueVTs[i].isZeroSized() && MemVTs[i] != ValueVTs[i]) Val = DAG.getPtrExtOrTrunc(Val, dl, MemVTs[i]); SDValue St = DAG.getStore(Root, dl, Val, Add, MachinePointerInfo(PtrV, Offsets[i]), Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp =================================================================== --- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -23039,6 +23039,10 @@ if (BasePtr.getBase().isUndef()) return false; + // Do not handle stores to opaque types + if (St->getMemoryVT().isZeroSized()) + return false; + // BaseIndexOffset assumes that offsets are fixed-size, which // is not valid for scalable vectors where the offsets are // scaled by `vscale`, so bail out early. Index: llvm/lib/CodeGen/MachineOperand.cpp =================================================================== --- llvm/lib/CodeGen/MachineOperand.cpp +++ llvm/lib/CodeGen/MachineOperand.cpp @@ -1167,8 +1167,11 @@ << "unknown-address"; } MachineOperand::printOperandOffset(OS, getOffset()); - if (getAlign() != getSize()) - OS << ", align " << getAlign().value(); + if (getSize() > 0) { + if (getAlign() != getSize()) + OS << ", align " << getAlign().value(); + } else + OS << ", opaque "; if (getAlign() != getBaseAlign()) OS << ", basealign " << getBaseAlign().value(); auto AAInfo = getAAInfo(); Index: llvm/lib/CodeGen/CodeGenPrepare.cpp =================================================================== --- llvm/lib/CodeGen/CodeGenPrepare.cpp +++ llvm/lib/CodeGen/CodeGenPrepare.cpp @@ -6451,6 +6451,10 @@ EVT LoadResultVT = TLI->getValueType(*DL, Load->getType()); unsigned BitWidth = LoadResultVT.getSizeInBits(); + // If the BitWidth is 0, do not try to optimize the type + if (BitWidth == 0) + return false; + APInt DemandBits(BitWidth, 0); APInt WidestAndBits(BitWidth, 0); Index: llvm/include/llvm/Support/MachineValueType.h =================================================================== --- llvm/include/llvm/Support/MachineValueType.h +++ llvm/include/llvm/Support/MachineValueType.h @@ -995,6 +995,11 @@ } } + /// Test if the given MVT has zero size + bool isZeroSized() const { + return !getSizeInBits().isScalable() && getFixedSizeInBits() == 0; + } + /// Return the size of the specified fixed width value type in bits. The /// function will assert if the type is scalable. uint64_t getFixedSizeInBits() const { Index: llvm/include/llvm/CodeGen/ValueTypes.h =================================================================== --- llvm/include/llvm/CodeGen/ValueTypes.h +++ llvm/include/llvm/CodeGen/ValueTypes.h @@ -120,6 +120,9 @@ return changeExtendedTypeToInteger(); } + /// Test if the given EVT has zero size + bool isZeroSized() const { return getSizeInBits() == 0; } + /// Test if the given EVT is simple (as opposed to being extended). bool isSimple() const { return V.SimpleTy != MVT::INVALID_SIMPLE_VALUE_TYPE; @@ -207,7 +210,9 @@ } /// Return true if the bit size is a multiple of 8. - bool isByteSized() const { return getSizeInBits().isKnownMultipleOf(8); } + bool isByteSized() const { + return !isZeroSized() && getSizeInBits().isKnownMultipleOf(8); + } /// Return true if the size is a power-of-two number of bytes. bool isRound() const { Index: llvm/include/llvm/CodeGen/TargetLowering.h =================================================================== --- llvm/include/llvm/CodeGen/TargetLowering.h +++ llvm/include/llvm/CodeGen/TargetLowering.h @@ -347,7 +347,7 @@ /// Return the in-memory pointer type for the given address space, defaults to /// the pointer type from the data layout. FIXME: The default needs to be /// removed once all the code is updated. - MVT getPointerMemTy(const DataLayout &DL, uint32_t AS = 0) const { + virtual MVT getPointerMemTy(const DataLayout &DL, uint32_t AS = 0) const { return MVT::getIntegerVT(DL.getPointerSizeInBits(AS)); } Index: clang/lib/Basic/Targets/WebAssembly.cpp =================================================================== --- clang/lib/Basic/Targets/WebAssembly.cpp +++ clang/lib/Basic/Targets/WebAssembly.cpp @@ -214,6 +214,8 @@ continue; } if (Feature == "+reference-types") { + // FIXME: Ensure address spaces 10 and 20 are marked as non-integral in + // the datalayout string. HasReferenceTypes = true; continue; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits