From 92a25fbf11da51c8e3573b81a877d3b226990c07 Mon Sep 17 00:00:00 2001 From: Vlad Tsyrklevich Date: Thu, 31 Oct 2019 16:50:36 -0700 Subject: [PATCH] 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/WebAssemblyISD.def | 4 ++-- .../Target/WebAssembly/WebAssemblyISelLowering.cpp | 9 +-------- .../Target/WebAssembly/WebAssemblyISelLowering.h | 8 -------- .../lib/Target/WebAssembly/WebAssemblyInstrSIMD.td | 23 +++++++++++++--------- llvm/test/CodeGen/WebAssembly/simd-load-splat.ll | 21 -------------------- 5 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 llvm/test/CodeGen/WebAssembly/simd-load-splat.ll diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISD.def b/llvm/lib/Target/WebAssembly/WebAssemblyISD.def index ba04fd4..13f0476 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyISD.def +++ b/llvm/lib/Target/WebAssembly/WebAssemblyISD.def @@ -30,9 +30,9 @@ HANDLE_NODETYPE(SWIZZLE) HANDLE_NODETYPE(VEC_SHL) HANDLE_NODETYPE(VEC_SHR_S) HANDLE_NODETYPE(VEC_SHR_U) +HANDLE_NODETYPE(LOAD_SPLAT) HANDLE_NODETYPE(THROW) HANDLE_NODETYPE(MEMORY_COPY) HANDLE_NODETYPE(MEMORY_FILL) -// Memory intrinsics -HANDLE_MEM_NODETYPE(LOAD_SPLAT) +// add memory opcodes starting at ISD::FIRST_TARGET_MEMORY_OPCODE here... diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp index 733ed74..f06afdb 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); } diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h index 4e0f7cf..a53e24a 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h +++ b/llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.h @@ -24,16 +24,8 @@ namespace WebAssemblyISD { enum NodeType : unsigned { FIRST_NUMBER = ISD::BUILTIN_OP_END, #define HANDLE_NODETYPE(NODE) NODE, -#define HANDLE_MEM_NODETYPE(NODE) #include "WebAssemblyISD.def" - FIRST_MEM_OPCODE = ISD::FIRST_TARGET_MEMORY_OPCODE, #undef HANDLE_NODETYPE -#undef HANDLE_MEM_NODETYPE -#define HANDLE_NODETYPE(NODE) -#define HANDLE_MEM_NODETYPE(NODE) NODE, -#include "WebAssemblyISD.def" -#undef HANDLE_NODETYPE -#undef HANDLE_MEM_NODETYPE }; } // end namespace WebAssemblyISD diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td b/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td index 751c565..fc5d73d 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td +++ b/llvm/lib/Target/WebAssembly/WebAssemblyInstrSIMD.td @@ -72,30 +72,35 @@ defm "" : SIMDLoadSplat<"v16x8", 195>; defm "" : SIMDLoadSplat<"v32x4", 196>; defm "" : SIMDLoadSplat<"v64x2", 197>; -def wasm_load_splat_t : SDTypeProfile<1, 1, [SDTCisPtrTy<1>]>; -def wasm_load_splat : SDNode<"WebAssemblyISD::LOAD_SPLAT", wasm_load_splat_t, - [SDNPHasChain, SDNPMayLoad, SDNPMemOperand]>; -def load_splat : PatFrag<(ops node:$addr), (wasm_load_splat node:$addr)>; +def wasm_load_splat_t : SDTypeProfile<1, 1, []>; +def wasm_load_splat : SDNode<"WebAssemblyISD::LOAD_SPLAT", wasm_load_splat_t>; + +foreach args = [["v16i8", "i32", "extloadi8"], ["v8i16", "i32", "extloadi16"], + ["v4i32", "i32", "load"], ["v2i64", "i64", "load"], + ["v4f32", "f32", "load"], ["v2f64", "f64", "load"]] in +def load_splat_#args[0] : + PatFrag<(ops node:$addr), (wasm_load_splat + (!cast(args[1]) (!cast(args[2]) node:$addr)))>; let Predicates = [HasUnimplementedSIMD128] in foreach args = [["v16i8", "v8x16"], ["v8i16", "v16x8"], ["v4i32", "v32x4"], ["v2i64", "v64x2"], ["v4f32", "v32x4"], ["v2f64", "v64x2"]] in { def : LoadPatNoOffset(args[0]), - load_splat, + !cast("load_splat_"#args[0]), !cast("LOAD_SPLAT_"#args[1])>; def : LoadPatImmOff(args[0]), - load_splat, + !cast("load_splat_"#args[0]), regPlusImm, !cast("LOAD_SPLAT_"#args[1])>; def : LoadPatImmOff(args[0]), - load_splat, + !cast("load_splat_"#args[0]), or_is_add, !cast("LOAD_SPLAT_"#args[1])>; def : LoadPatOffsetOnly(args[0]), - load_splat, + !cast("load_splat_"#args[0]), !cast("LOAD_SPLAT_"#args[1])>; def : LoadPatGlobalAddrOffOnly(args[0]), - load_splat, + !cast("load_splat_"#args[0]), !cast("LOAD_SPLAT_"#args[1])>; } diff --git a/llvm/test/CodeGen/WebAssembly/simd-load-splat.ll b/llvm/test/CodeGen/WebAssembly/simd-load-splat.ll deleted file mode 100644 index 4e693c2..0000000 --- a/llvm/test/CodeGen/WebAssembly/simd-load-splat.ll +++ /dev/null @@ -1,21 +0,0 @@ -; RUN: llc < %s -asm-verbose=false -verify-machineinstrs -disable-wasm-fallthrough-return-opt -wasm-keep-registers -wasm-disable-explicit-locals -mattr=+unimplemented-simd128 | FileCheck %s - -; Regression test for an ISel failure when a splatted load had more -; than one use. The main tests for load_splat are in simd-offset.ll. - -target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128" -target triple = "wasm32-unknown-unknown" - -; CHECK-LABEL: load_splat: -; CHECK-NEXT: .functype load_splat (i32, i32) -> (i32) -; CHECK-NEXT: i32.load8_u $[[E:[0-9]+]]=, 0($0){{$}} -; CHECK-NEXT: v8x16.load_splat $push[[V:[0-9]+]]=, 0($0){{$}} -; CHECK-NEXT: v128.store 0($1), $pop[[V]]{{$}} -; CHECK-NEXT: return $[[E]]{{$}} -define i8 @load_splat(i8* %p, <16 x i8>* %out) { - %e = load i8, i8* %p - %v1 = insertelement <16 x i8> undef, i8 %e, i32 0 - %v2 = shufflevector <16 x i8> %v1, <16 x i8> undef, <16 x i32> zeroinitializer - store <16 x i8> %v2, <16 x i8>* %out - ret i8 %e -} -- 2.7.4