From f9c0a5c377cca8f7257e85f5d332f5009027f325 Mon Sep 17 00:00:00 2001 From: Derek Schuff Date: Tue, 23 Feb 2016 22:13:21 +0000 Subject: [PATCH] Revert "[WebAssembly] Stackify code emitted by eliminateFrameIndex" This reverts r261685 due to wasm test breakage. llvm-svn: 261702 --- .../Target/WebAssembly/WebAssemblyRegisterInfo.cpp | 10 +++------ llvm/test/CodeGen/WebAssembly/byval.ll | 12 +++++----- llvm/test/CodeGen/WebAssembly/mem-intrinsics.ll | 4 ++-- llvm/test/CodeGen/WebAssembly/userstack.ll | 26 +++++++++++----------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.cpp index bebc68e..607fd6e 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyRegisterInfo.cpp @@ -84,18 +84,14 @@ void WebAssemblyRegisterInfo::eliminateFrameIndex( unsigned FIRegOperand = WebAssembly::SP32; if (FrameOffset) { - auto *WFI = MF.getInfo(); - unsigned OffsetOp = MRI.createVirtualRegister(&WebAssembly::I32RegClass); + FIRegOperand = MRI.createVirtualRegister(&WebAssembly::I32RegClass); BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(WebAssembly::CONST_I32), - OffsetOp) + FIRegOperand) .addImm(FrameOffset); - WFI->stackifyVReg(OffsetOp); - FIRegOperand = MRI.createVirtualRegister(&WebAssembly::I32RegClass); BuildMI(MBB, MI, MI.getDebugLoc(), TII->get(WebAssembly::ADD_I32), FIRegOperand) .addReg(WebAssembly::SP32) - .addReg(OffsetOp); - WFI->stackifyVReg(FIRegOperand); + .addReg(FIRegOperand); } MI.getOperand(FIOperandNum).ChangeToRegister(FIRegOperand, /*IsDef=*/false); } diff --git a/llvm/test/CodeGen/WebAssembly/byval.ll b/llvm/test/CodeGen/WebAssembly/byval.ll index f01ef55..e3dd37e 100644 --- a/llvm/test/CodeGen/WebAssembly/byval.ll +++ b/llvm/test/CodeGen/WebAssembly/byval.ll @@ -35,9 +35,9 @@ define void @byval_arg(%SmallStruct* %ptr) { ; CHECK-NEXT: i32.load $push[[L4:.+]]=, 0($0) ; CHECK-NEXT: i32.store {{.*}}=, 12([[SP]]), $pop[[L4]] ; Pass a pointer to the stack slot to the function - ; CHECK-NEXT: i32.const $push[[L5:.+]]=, 12 - ; CHECK-NEXT: i32.add $push[[ARG:.+]]=, [[SP]], $pop[[L5]] - ; CHECK-NEXT: call ext_byval_func@FUNCTION, $pop[[ARG]] + ; CHECK-NEXT: i32.const [[L5:.+]]=, 12 + ; CHECK-NEXT: i32.add [[ARG:.+]]=, [[SP]], [[L5]] + ; CHECK-NEXT: call ext_byval_func@FUNCTION, [[L5]] call void @ext_byval_func(%SmallStruct* byval %ptr) ; Restore the stack ; CHECK-NEXT: i32.const $push[[L6:.+]]=, 16 @@ -58,9 +58,9 @@ define void @byval_arg_align8(%SmallStruct* %ptr) { ; CHECK: i32.load $push[[L4:.+]]=, 0($0):p2align=3 ; CHECK-NEXT: i32.store {{.*}}=, 8([[SP]]):p2align=3, $pop[[L4]] ; Pass a pointer to the stack slot to the function - ; CHECK-NEXT: i32.const $push[[L5:.+]]=, 8 - ; CHECK-NEXT: i32.add $push[[ARG:.+]]=, [[SP]], $pop[[L5]] - ; CHECK-NEXT: call ext_byval_func_align8@FUNCTION, $pop[[ARG]] + ; CHECK-NEXT: i32.const [[L5:.+]]=, 8 + ; CHECK-NEXT: i32.add [[ARG:.+]]=, [[SP]], [[L5]] + ; CHECK-NEXT: call ext_byval_func_align8@FUNCTION, [[L5]] call void @ext_byval_func_align8(%SmallStruct* byval align 8 %ptr) ret void } diff --git a/llvm/test/CodeGen/WebAssembly/mem-intrinsics.ll b/llvm/test/CodeGen/WebAssembly/mem-intrinsics.ll index bcbd1e4..2c09784 100644 --- a/llvm/test/CodeGen/WebAssembly/mem-intrinsics.ll +++ b/llvm/test/CodeGen/WebAssembly/mem-intrinsics.ll @@ -61,8 +61,8 @@ define void @set_no(i8* %dst, i8 %src, i32 %len) { ; CHECK-LABEL: frame_index: -; CHECK: i32.call $discard=, memset@FUNCTION, $pop11, $pop1, $pop0{{$}} -; CHECK: i32.call $discard=, memset@FUNCTION, $0, $pop3, $pop2{{$}} +; CHECK: i32.call $discard=, memset@FUNCTION, $0, $pop1, $pop0{{$}} +; CHECK: i32.call $discard=, memset@FUNCTION, $1, $pop3, $pop2{{$}} ; CHECK: return{{$}} define void @frame_index() { entry: diff --git a/llvm/test/CodeGen/WebAssembly/userstack.ll b/llvm/test/CodeGen/WebAssembly/userstack.ll index b535734..15581f9 100644 --- a/llvm/test/CodeGen/WebAssembly/userstack.ll +++ b/llvm/test/CodeGen/WebAssembly/userstack.ll @@ -49,7 +49,7 @@ define void @alloca3264() { } ; CHECK-LABEL: allocarray: -; CHECK: .local i32{{$}} +; CHECK: .local i32, i32{{$}} define void @allocarray() { ; CHECK: i32.const $push[[L1:.+]]=, __stack_pointer ; CHECK-NEXT: i32.load $push[[L2:.+]]=, 0($pop[[L1]]) @@ -60,9 +60,9 @@ define void @allocarray() { %r = alloca [33 x i32] ; CHECK-NEXT: i32.const $push[[L4:.+]]=, 12 - ; CHECK-NEXT: i32.const $push[[L5:.+]]=, 12 - ; CHECK-NEXT: i32.add $push[[L7:.+]]=, [[SP]], $pop[[L5]] - ; CHECK-NEXT: i32.add $push[[L6:.+]]=, $pop[[L7]], $pop[[L4]] + ; CHECK-NEXT: i32.const [[L5:.+]]=, 12 + ; CHECK-NEXT: i32.add [[L5]]=, [[SP]], [[L5]] + ; CHECK-NEXT: i32.add $push[[L6:.+]]=, [[L5]], $pop[[L4]] ; CHECK-NEXT: i32.const $push[[L9:.+]]=, 1{{$}} ; CHECK-NEXT: i32.store $push[[L10:.+]]=, 12([[SP]]), $pop[[L9]]{{$}} ; CHECK-NEXT: i32.store $discard=, 0($pop3), $pop[[L10]]{{$}} @@ -86,18 +86,18 @@ define void @non_mem_use(i8** %addr) { %r = alloca i64 %r2 = alloca i64 ; %r is at SP+8 - ; CHECK: i32.const $push[[OFF:.+]]=, 8 - ; CHECK-NEXT: i32.add $push[[ARG1:.+]]=, [[SP]], $pop[[OFF]] - ; CHECK-NEXT: call ext_func@FUNCTION, $pop[[ARG1]] + ; CHECK: i32.const [[OFF:.+]]=, 8 + ; CHECK-NEXT: i32.add [[ARG1:.+]]=, [[SP]], [[OFF]] + ; CHECK-NEXT: call ext_func@FUNCTION, [[ARG1]] call void @ext_func(i64* %r) ; %r2 is at SP+0, no add needed ; CHECK-NEXT: call ext_func@FUNCTION, [[SP]] call void @ext_func(i64* %r2) ; Use as a value, but in a store ; %buf is at SP+16 - ; CHECK: i32.const $push[[OFF:.+]]=, 16 - ; CHECK-NEXT: i32.add $push[[VAL:.+]]=, [[SP]], $pop[[OFF]] - ; CHECK-NEXT: i32.store {{.*}}=, 0($0), $pop[[VAL]] + ; CHECK: i32.const [[OFF:.+]]=, 16 + ; CHECK-NEXT: i32.add [[VAL:.+]]=, [[SP]], [[OFF]] + ; CHECK-NEXT: i32.store {{.*}}=, 0($0), [[VAL]] %gep = getelementptr inbounds [27 x i8], [27 x i8]* %buf, i32 0, i32 0 store i8* %gep, i8** %addr ret void @@ -198,9 +198,9 @@ entry: ; CHECK: i32.const $push[[L1:.+]]=, 16 ; CHECK-NEXT: i32.sub [[SP:.+]]=, {{.+}}, $pop[[L1]] %addr = alloca i32 - ; CHECK: i32.const $push[[OFF:.+]]=, 12 - ; CHECK-NEXT: i32.add $push[[ADDR:.+]]=, [[SP]], $pop[[OFF]] - ; CHECK-NEXT: copy_local [[COPY:.+]]=, $pop[[ADDR]] + ; CHECK: i32.const [[OFF:.+]]=, 12 + ; CHECK-NEXT: i32.add [[ADDR:.+]]=, [[SP]], [[OFF]] + ; CHECK-NEXT: copy_local [[COPY:.+]]=, [[ADDR]] br label %body body: %a = phi i32* [%addr, %entry], [%b, %body] -- 2.7.4