[llvm] r370430 - [CodeGen] Fix lowering for returning the result of an extractvalue
Dan Gohman via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 29 21:33:23 PDT 2019
Author: djg
Date: Thu Aug 29 21:33:22 2019
New Revision: 370430
URL: http://llvm.org/viewvc/llvm-project?rev=370430&view=rev
Log:
[CodeGen] Fix lowering for returning the result of an extractvalue
When the number of return values exceeds the number of registers available,
SelectionDAGBuilder::visitRet transforms a function's return to use a
pointer to a buffer to hold return values. When the returned value is an
operator such as extractvalue, the value may have a non-zero result number.
Add that number to the indexing when obtaining the values to store.
This fixes https://bugs.llvm.org/show_bug.cgi?id=43132.
Differential Revision: https://reviews.llvm.org/D66978
Added:
llvm/trunk/test/CodeGen/WebAssembly/multi-return.ll
Modified:
llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp?rev=370430&r1=370429&r2=370430&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Thu Aug 29 21:33:22 2019
@@ -1809,7 +1809,7 @@ void SelectionDAGBuilder::visitRet(const
// offsets to its parts don't wrap either.
SDValue Ptr = DAG.getObjectPtrOffset(getCurSDLoc(), RetPtr, Offsets[i]);
- SDValue Val = RetOp.getValue(i);
+ SDValue Val = RetOp.getValue(RetOp.getResNo() + i);
if (MemVTs[i] != ValueVTs[i])
Val = DAG.getPtrExtOrTrunc(Val, getCurSDLoc(), MemVTs[i]);
Chains[i] = DAG.getStore(Chain, getCurSDLoc(), Val,
Added: llvm/trunk/test/CodeGen/WebAssembly/multi-return.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/WebAssembly/multi-return.ll?rev=370430&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/WebAssembly/multi-return.ll (added)
+++ llvm/trunk/test/CodeGen/WebAssembly/multi-return.ll Thu Aug 29 21:33:22 2019
@@ -0,0 +1,200 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc < %s -asm-verbose=false -wasm-disable-explicit-locals -wasm-keep-registers | FileCheck %s
+
+target datalayout = "e-m:e-p:32:32-i64:64-n32:64-S128"
+target triple = "wasm32-unknown-unknown"
+
+; Return multiple values, some of which will be legalized into multiple values.
+declare { i64, i128, i192, i128, i64 } @return_multi_multi()
+
+; Test returning a single value from @return_multi_multi.
+
+define i64 @test0() {
+; CHECK-LABEL: test0
+; CHECK: call return_multi_multi
+; CHECK: i64.load $0=, 8($1)
+; CHECK: local.copy $push8=, $0
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %t1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 0
+ ret i64 %t1
+}
+
+define i128 @test1() {
+; CHECK-LABEL: test1
+; CHECK: call return_multi_multi
+; CHECK: i64.load $1=, 16($2)
+; CHECK: i32.const $push0=, 24
+; CHECK: i32.add $push1=, $2, $pop0
+; CHECK: i64.load $push2=, 0($pop1)
+; CHECK: i64.store 8($0), $pop2
+; CHECK: i64.store 0($0), $1
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %t1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 1
+ ret i128 %t1
+}
+
+define i192 @test2() {
+; CHECK-LABEL: test2
+; CHECK: call return_multi_multi
+; CHECK: i32.const $push0=, 40
+; CHECK: i32.add $push1=, $3, $pop0
+; CHECK: i64.load $1=, 0($pop1)
+; CHECK: i64.load $2=, 32($3)
+; CHECK: i32.const $push2=, 48
+; CHECK: i32.add $push3=, $3, $pop2
+; CHECK: i64.load $push4=, 0($pop3)
+; CHECK: i64.store 16($0), $pop4
+; CHECK: i64.store 0($0), $2
+; CHECK: i64.store 8($0), $1
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %t1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 2
+ ret i192 %t1
+}
+
+define i128 @test3() {
+; CHECK-LABEL: test3
+; CHECK: call return_multi_multi
+; CHECK: i64.load $1=, 56($2)
+; CHECK: i32.const $push0=, 64
+; CHECK: i32.add $push1=, $2, $pop0
+; CHECK: i64.load $push2=, 0($pop1)
+; CHECK: i64.store 8($0), $pop2
+; CHECK: i64.store 0($0), $1
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %t1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 3
+ ret i128 %t1
+}
+
+define i64 @test4() {
+; CHECK-LABEL: test4
+; CHECK: call return_multi_multi
+; CHECK: i64.load $0=, 72($1)
+; CHECK: local.copy $push8=, $0
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %t1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 4
+ ret i64 %t1
+}
+
+; Test returning multiple values from @return_multi_multi.
+
+define { i64, i128 } @test5() {
+; CHECK-LABEL: test5
+; CHECK: call return_multi_multi
+; CHECK: i32.const $push10=, 8
+; CHECK: i32.add $push11=, $3, $pop10
+; CHECK: i32.const $push0=, 16
+; CHECK: i32.add $push1=, $pop11, $pop0
+; CHECK: i64.load $1=, 0($pop1)
+; CHECK: i64.load $2=, 8($3)
+; CHECK: i64.load $push2=, 16($3)
+; CHECK: i64.store 8($0), $pop2
+; CHECK: i32.const $push12=, 16
+; CHECK: i32.add $push3=, $0, $pop12
+; CHECK: i64.store 0($pop3), $1
+; CHECK: i64.store 0($0), $2
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %r0 = extractvalue { i64, i128, i192, i128, i64 } %t0, 0
+ %r1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 1
+ %s0 = insertvalue { i64, i128 } undef, i64 %r0, 0
+ %s1 = insertvalue { i64, i128 } %s0, i128 %r1, 1
+ ret { i64, i128 } %s1
+}
+
+define { i128, i128 } @test6() {
+; CHECK-LABEL: test6
+; CHECK: call return_multi_multi
+; CHECK: i32.const $push0=, 24
+; CHECK: i32.add $push1=, $4, $pop0
+; CHECK: i64.load $1=, 0($pop1)
+; CHECK: i32.const $push2=, 64
+; CHECK: i32.add $push3=, $4, $pop2
+; CHECK: i64.load $2=, 0($pop3)
+; CHECK: i64.load $3=, 16($4)
+; CHECK: i64.load $push4=, 56($4)
+; CHECK: i64.store 16($0), $pop4
+; CHECK: i32.const $push5=, 24
+; CHECK: i32.add $push6=, $0, $pop5
+; CHECK: i64.store 0($pop6), $2
+; CHECK: i64.store 0($0), $3
+; CHECK: i64.store 8($0), $1
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %r1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 1
+ %r3 = extractvalue { i64, i128, i192, i128, i64 } %t0, 3
+ %s0 = insertvalue { i128, i128 } undef, i128 %r1, 0
+ %s1 = insertvalue { i128, i128 } %s0, i128 %r3, 1
+ ret { i128, i128 } %s1
+}
+
+define { i64, i192 } @test7() {
+; CHECK-LABEL: test7
+; CHECK: call return_multi_multi
+; CHECK: i32.const $push2=, 40
+; CHECK: i32.add $push3=, $4, $pop2
+; CHECK: i64.load $1=, 0($pop3)
+; CHECK: i64.load $2=, 8($4)
+; CHECK: i64.load $3=, 32($4)
+; CHECK: i32.const $push0=, 24
+; CHECK: i32.add $push1=, $0, $pop0
+; CHECK: i32.const $push4=, 48
+; CHECK: i32.add $push5=, $4, $pop4
+; CHECK: i64.load $push6=, 0($pop5)
+; CHECK: i64.store 0($pop1), $pop6
+; CHECK: i64.store 8($0), $3
+; CHECK: i32.const $push7=, 16
+; CHECK: i32.add $push8=, $0, $pop7
+; CHECK: i64.store 0($pop8), $1
+; CHECK: i64.store 0($0), $2
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %r0 = extractvalue { i64, i128, i192, i128, i64 } %t0, 0
+ %r2 = extractvalue { i64, i128, i192, i128, i64 } %t0, 2
+ %s0 = insertvalue { i64, i192 } undef, i64 %r0, 0
+ %s1 = insertvalue { i64, i192 } %s0, i192 %r2, 1
+ ret { i64, i192 } %s1
+}
+
+define { i128, i192, i128, i64 } @test8() {
+; CHECK-LABEL: test8
+; CHECK: call return_multi_multi
+; CHECK: i32.const $push0=, 64
+; CHECK: i32.add $push1=, $8, $pop0
+; CHECK: i64.load $1=, 0($pop1)
+; CHECK: i32.const $push20=, 8
+; CHECK: i32.add $push21=, $8, $pop20
+; CHECK: i32.const $push2=, 32
+; CHECK: i32.add $push3=, $pop21, $pop2
+; CHECK: i64.load $2=, 0($pop3)
+; CHECK: i32.const $push4=, 48
+; CHECK: i32.add $push5=, $8, $pop4
+; CHECK: i64.load $3=, 0($pop5)
+; CHECK: i32.const $push6=, 24
+; CHECK: i32.add $push7=, $8, $pop6
+; CHECK: i64.load $4=, 0($pop7)
+; CHECK: i64.load $5=, 8($8)
+; CHECK: i64.load $6=, 56($8)
+; CHECK: i64.load $7=, 32($8)
+; CHECK: i64.load $push8=, 16($8)
+; CHECK: i64.store 40($0), $pop8
+; CHECK: i32.const $push9=, 48
+; CHECK: i32.add $push10=, $0, $pop9
+; CHECK: i64.store 0($pop10), $4
+; CHECK: i32.const $push22=, 32
+; CHECK: i32.add $push11=, $0, $pop22
+; CHECK: i64.store 0($pop11), $3
+; CHECK: i64.store 16($0), $7
+; CHECK: i32.const $push12=, 24
+; CHECK: i32.add $push13=, $0, $pop12
+; CHECK: i64.store 0($pop13), $2
+; CHECK: i64.store 0($0), $6
+; CHECK: i64.store 8($0), $1
+; CHECK: i64.store 56($0), $5
+ %t0 = call { i64, i128, i192, i128, i64 } @return_multi_multi()
+ %r0 = extractvalue { i64, i128, i192, i128, i64 } %t0, 0
+ %r1 = extractvalue { i64, i128, i192, i128, i64 } %t0, 1
+ %r2 = extractvalue { i64, i128, i192, i128, i64 } %t0, 2
+ %r3 = extractvalue { i64, i128, i192, i128, i64 } %t0, 3
+ %s0 = insertvalue { i128, i192, i128, i64 } undef, i128 %r3, 0
+ %s1 = insertvalue { i128, i192, i128, i64 } %s0, i192 %r2, 1
+ %s2 = insertvalue { i128, i192, i128, i64 } %s1, i128 %r1, 2
+ %s3 = insertvalue { i128, i192, i128, i64 } %s2, i64 %r0, 3
+ ret { i128, i192, i128, i64 } %s3
+}
More information about the llvm-commits
mailing list