From 92a25fbf11da51c8e3573b81a877d3b226990c07 Mon Sep 17 00:00:00 2001 From: Vlad Tsyrklevich Date: Thu, 31 Oct 2019 16:50:36 -0700 Subject: Revert "[WebAssembly] Handle multiple loads of splatted loads" This reverts commit 2ab1b8c1ec452fb743f6cc5051e75a01039cabfe, it is causing build failures on numerous bots, including sanitizer-x86_64-linux-bootstrap-ubsan. My previous revert was for the wrong commit. --- llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp') diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp index 733ed743865..f06afdbcea9 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp @@ -461,14 +461,11 @@ const char * WebAssemblyTargetLowering::getTargetNodeName(unsigned Opcode) const { switch (static_cast(Opcode)) { case WebAssemblyISD::FIRST_NUMBER: - case WebAssemblyISD::FIRST_MEM_OPCODE: break; #define HANDLE_NODETYPE(NODE) \ case WebAssemblyISD::NODE: \ return "WebAssemblyISD::" #NODE; -#define HANDLE_MEM_NODETYPE(NODE) HANDLE_NODETYPE(NODE) #include "WebAssemblyISD.def" -#undef HANDLE_MEM_NODETYPE #undef HANDLE_NODETYPE } return nullptr; @@ -1428,11 +1425,7 @@ SDValue WebAssemblyTargetLowering::LowerBUILD_VECTOR(SDValue Op, if (Subtarget->hasUnimplementedSIMD128() && (SplattedLoad = dyn_cast(SplatValue)) && SplattedLoad->getMemoryVT() == VecT.getVectorElementType()) { - Result = DAG.getMemIntrinsicNode( - WebAssemblyISD::LOAD_SPLAT, DL, DAG.getVTList({VecT}), - {SplattedLoad->getChain(), SplattedLoad->getBasePtr(), - SplattedLoad->getOffset()}, - SplattedLoad->getMemoryVT(), SplattedLoad->getMemOperand()); + Result = DAG.getNode(WebAssemblyISD::LOAD_SPLAT, DL, VecT, SplatValue); } else { Result = DAG.getSplatBuildVector(VecT, DL, SplatValue); } -- cgit v1.2.3