This is an archive of the discontinued LLVM Phabricator instance.

Differential D146533

[WebAssembly] Fix i64_i64_func_i64_i64_i32 type signature when multivalue feature is enabled
ClosedPublic

Authored by HerrCai0907 on Mar 21 2023, 8:36 AM.

Details

Reviewers
tlively
Commits
rG696fdece49e5: [WebAssembly] Fix i64_i64_func_i64_i64_i32 type signature when multivalue…

Diff Detail

Event Timeline

HerrCai0907 created this revision.Mar 21 2023, 8:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 21 2023, 8:36 AM
Herald added subscribers: pmatos, asb, ecnelises and 5 others. · View Herald Transcript
HerrCai0907 requested review of this revision.Mar 21 2023, 8:36 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 21 2023, 8:36 AM
Herald added subscribers: llvm-commits, aheejin. · View Herald Transcript
HerrCai0907 updated this revision to Diff 507005.Mar 21 2023, 9:03 AM

add testcase

HerrCai0907 added a reviewer: tlively.Mar 21 2023, 9:10 AM
HerrCai0907 updated this revision to Diff 507016.Mar 21 2023, 9:19 AM

rebase

Harbormaster completed remote builds in B220748: Diff 507016.Mar 21 2023, 11:03 AM
tlively accepted this revision.Mar 21 2023, 2:48 PM
This revision is now accepted and ready to land.Mar 21 2023, 2:48 PM
Closed by commit rG696fdece49e5: [WebAssembly] Fix i64_i64_func_i64_i64_i32 type signature when multivalue… (authored by HerrCai0907). · Explain WhyMar 21 2023, 3:54 PM
This revision was automatically updated to reflect the committed changes.
HerrCai0907 added a commit: rG696fdece49e5: [WebAssembly] Fix i64_i64_func_i64_i64_i32 type signature when multivalue….

Revision Contents

PathSize
llvm/
lib/
Target/
WebAssembly/
2 lines
test/
CodeGen/
WebAssembly/
45 lines

Diff 507168

llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp

Show First 20 Lines • Show All 766 Lines • ▼ Show 20 Lines case i64_i64_i64_i64_func_i64_i64_i64_i64:
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
break; break;
case i64_i64_func_i64_i64_i32: case i64_i64_func_i64_i64_i32:
if (Subtarget.hasMultivalue()) { if (Subtarget.hasMultivalue()) {
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64); Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64);
Rets.push_back(wasm::ValType::I64);
} else { } else {
Params.push_back(PtrTy); Params.push_back(PtrTy);
} }
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I64); Params.push_back(wasm::ValType::I64);
Params.push_back(wasm::ValType::I32); Params.push_back(wasm::ValType::I32);
break; break;
case iPTR_func_i32: case iPTR_func_i32:
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

llvm/test/CodeGen/WebAssembly/multivalue_libcall.ll

Show First 20 Lines • Show All 90 Lines • ▼ Show 20 Lines
; NO_MULTIVALUE-NEXT: local.get 5 ; NO_MULTIVALUE-NEXT: local.get 5
; NO_MULTIVALUE-NEXT: i32.const 16 ; NO_MULTIVALUE-NEXT: i32.const 16
; NO_MULTIVALUE-NEXT: i32.add ; NO_MULTIVALUE-NEXT: i32.add
; NO_MULTIVALUE-NEXT: global.set __stack_pointer ; NO_MULTIVALUE-NEXT: global.set __stack_pointer
; NO_MULTIVALUE-NEXT: # fallthrough-return ; NO_MULTIVALUE-NEXT: # fallthrough-return
%sub = fsub fp128 %a, %b %sub = fsub fp128 %a, %b
ret fp128 %sub ret fp128 %sub
} }
define i128 @multivalue_lshr(i128 %a, i128 %b) {
; MULTIVALUE-LABEL: multivalue_lshr:
; MULTIVALUE: .functype multivalue_lshr (i64, i64, i64, i64) -> (i64, i64)
; MULTIVALUE-NEXT: # %bb.0:
; MULTIVALUE-NEXT: local.get 2
; MULTIVALUE-NEXT: local.get 3
; MULTIVALUE-NEXT: local.get 0
; MULTIVALUE-NEXT: i32.wrap_i64
; MULTIVALUE-NEXT: call __ashlti3
; MULTIVALUE-NEXT: # fallthrough-return
;
; NO_MULTIVALUE-LABEL: multivalue_lshr:
; NO_MULTIVALUE: .functype multivalue_lshr (i32, i64, i64, i64, i64) -> ()
; NO_MULTIVALUE-NEXT: .local i32
; NO_MULTIVALUE-NEXT: # %bb.0:
; NO_MULTIVALUE-NEXT: global.get __stack_pointer
; NO_MULTIVALUE-NEXT: i32.const 16
; NO_MULTIVALUE-NEXT: i32.sub
; NO_MULTIVALUE-NEXT: local.tee 5
; NO_MULTIVALUE-NEXT: global.set __stack_pointer
; NO_MULTIVALUE-NEXT: local.get 5
; NO_MULTIVALUE-NEXT: local.get 3
; NO_MULTIVALUE-NEXT: local.get 4
; NO_MULTIVALUE-NEXT: local.get 1
; NO_MULTIVALUE-NEXT: i32.wrap_i64
; NO_MULTIVALUE-NEXT: call __ashlti3
; NO_MULTIVALUE-NEXT: local.get 0
; NO_MULTIVALUE-NEXT: local.get 5
; NO_MULTIVALUE-NEXT: i32.const 8
; NO_MULTIVALUE-NEXT: i32.add
; NO_MULTIVALUE-NEXT: i64.load 0
; NO_MULTIVALUE-NEXT: i64.store 8
; NO_MULTIVALUE-NEXT: local.get 0
; NO_MULTIVALUE-NEXT: local.get 5
; NO_MULTIVALUE-NEXT: i64.load 0
; NO_MULTIVALUE-NEXT: i64.store 0
; NO_MULTIVALUE-NEXT: local.get 5
; NO_MULTIVALUE-NEXT: i32.const 16
; NO_MULTIVALUE-NEXT: i32.add
; NO_MULTIVALUE-NEXT: global.set __stack_pointer
; NO_MULTIVALUE-NEXT: # fallthrough-return
%tmp = shl i128 %b, %a
ret i128 %tmp
}