This is an archive of the discontinued LLVM Phabricator instance.

Differential D64949

[WebAssembly] Fix __builtin_wasm_tls_base intrinsic
ClosedPublic

Authored by quantum on Jul 18 2019, 1:43 PM.

Details

Reviewers
tlively
aheejin
sbc100
sunfish
Commits
rGdf4479200b39: [WebAssembly] Fix __builtin_wasm_tls_base intrinsic
rL366499: [WebAssembly] Fix __builtin_wasm_tls_base intrinsic
rC366499: [WebAssembly] Fix __builtin_wasm_tls_base intrinsic
Summary

Properly generate the outchain for the __builtin_wasm_tls_base intrinsic.

Also marked the intrinsic pure, per @sunfish's suggestion.

Diff Detail

Repository
rL LLVM

Event Timeline

quantum created this revision.Jul 18 2019, 1:43 PM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJul 18 2019, 1:43 PM
Herald added subscribers: llvm-commits, cfe-commits, hiraditya and 2 others. · View Herald Transcript
Harbormaster completed remote builds in B35304: Diff 210662.Jul 18 2019, 1:46 PM
tlively accepted this revision.Jul 18 2019, 2:08 PM

LGTM modulo a test!

This revision is now accepted and ready to land.Jul 18 2019, 2:08 PM
quantum updated this revision to Diff 210675.Jul 18 2019, 2:16 PM

Add a test with a memory dependency on __builtin_wasm_tls_base.

Harbormaster completed remote builds in B35309: Diff 210675.Jul 18 2019, 2:17 PM
Closed by commit rL366499: [WebAssembly] Fix __builtin_wasm_tls_base intrinsic (authored by quantum). · Explain WhyJul 18 2019, 2:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
include/
clang/
Basic/
2 lines
llvm/
trunk/
lib/
Target/
WebAssembly/
2 lines
test/
CodeGen/
WebAssembly/
11 lines

Diff 210676

cfe/trunk/include/clang/Basic/BuiltinsWebAssembly.def

Show All 25 Lines
BUILTIN(__builtin_wasm_memory_grow, "zIiz", "n") BUILTIN(__builtin_wasm_memory_grow, "zIiz", "n")
// Bulk memory builtins // Bulk memory builtins
TARGET_BUILTIN(__builtin_wasm_memory_init, "vIUiIUiv*UiUi", "", "bulk-memory") TARGET_BUILTIN(__builtin_wasm_memory_init, "vIUiIUiv*UiUi", "", "bulk-memory")
TARGET_BUILTIN(__builtin_wasm_data_drop, "vIUi", "", "bulk-memory") TARGET_BUILTIN(__builtin_wasm_data_drop, "vIUi", "", "bulk-memory")
// Thread-local storage // Thread-local storage
TARGET_BUILTIN(__builtin_wasm_tls_size, "z", "nc", "bulk-memory") TARGET_BUILTIN(__builtin_wasm_tls_size, "z", "nc", "bulk-memory")
TARGET_BUILTIN(__builtin_wasm_tls_base, "v*", "n", "bulk-memory") TARGET_BUILTIN(__builtin_wasm_tls_base, "v*", "nU", "bulk-memory")
// Floating point min/max // Floating point min/max
BUILTIN(__builtin_wasm_min_f32, "fff", "nc") BUILTIN(__builtin_wasm_min_f32, "fff", "nc")
BUILTIN(__builtin_wasm_max_f32, "fff", "nc") BUILTIN(__builtin_wasm_max_f32, "fff", "nc")
BUILTIN(__builtin_wasm_min_f64, "ddd", "nc") BUILTIN(__builtin_wasm_min_f64, "ddd", "nc")
BUILTIN(__builtin_wasm_max_f64, "ddd", "nc") BUILTIN(__builtin_wasm_max_f64, "ddd", "nc")
// Exception handling builtins. // Exception handling builtins.
▲ Show 20 Lines • Show All 74 Lines • Show Last 20 Lines

llvm/trunk/lib/Target/WebAssembly/WebAssemblyISelDAGToDAG.cpp

Show First 20 Lines • Show All 229 Lines • ▼ Show 20 Linesvoid WebAssemblyDAGToDAGISel::Select(SDNode *Node) {
case ISD::INTRINSIC_W_CHAIN: { case ISD::INTRINSIC_W_CHAIN: {
unsigned IntNo = cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue(); unsigned IntNo = cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue();
switch (IntNo) { switch (IntNo) {
case Intrinsic::wasm_tls_base: { case Intrinsic::wasm_tls_base: {
MVT PtrVT = TLI->getPointerTy(CurDAG->getDataLayout()); MVT PtrVT = TLI->getPointerTy(CurDAG->getDataLayout());
assert(PtrVT == MVT::i32 && "only wasm32 is supported for now"); assert(PtrVT == MVT::i32 && "only wasm32 is supported for now");
MachineSDNode *TLSBase = CurDAG->getMachineNode( MachineSDNode *TLSBase = CurDAG->getMachineNode(
WebAssembly::GLOBAL_GET_I32, DL, MVT::i32, WebAssembly::GLOBAL_GET_I32, DL, MVT::i32, MVT::Other,
CurDAG->getTargetExternalSymbol("__tls_base", PtrVT), CurDAG->getTargetExternalSymbol("__tls_base", PtrVT),
Node->getOperand(0)); Node->getOperand(0));
ReplaceNode(Node, TLSBase); ReplaceNode(Node, TLSBase);
return; return;
} }
} }
break; break;
} }
Show All 31 Lines

llvm/trunk/test/CodeGen/WebAssembly/tls-general-dynamic.ll

Show First 20 Lines • Show All 78 Lines • ▼ Show 20 Lines
; CHECK-NEXT: .functype tls_base () -> (i32) ; CHECK-NEXT: .functype tls_base () -> (i32)
define i8* @tls_base() { define i8* @tls_base() {
; CHECK-NEXT: global.get __tls_base ; CHECK-NEXT: global.get __tls_base
; CHECK-NEXT: return ; CHECK-NEXT: return
%1 = call i8* @llvm.wasm.tls.base() %1 = call i8* @llvm.wasm.tls.base()
ret i8* %1 ret i8* %1
} }
; CHECK-LABEL: tls_base_write:
; CHECK-NEXT: .functype tls_base_write (i32) -> ()
define void @tls_base_write(i8** %output) {
; CHECK-NEXT: global.get __tls_base
; CHECK-NEXT: i32.store 0
; CHECK-NEXT: return
%1 = call i8* @llvm.wasm.tls.base()
store i8* %1, i8** %output
ret void
}
; CHECK: .type tls,@object ; CHECK: .type tls,@object
; TLS-NEXT: .section .tbss.tls,"",@ ; TLS-NEXT: .section .tbss.tls,"",@
; NO-TLS-NEXT: .section .bss.tls,"",@ ; NO-TLS-NEXT: .section .bss.tls,"",@
; CHECK-NEXT: .p2align 2 ; CHECK-NEXT: .p2align 2
; CHECK-NEXT: tls: ; CHECK-NEXT: tls:
; CHECK-NEXT: .int32 0 ; CHECK-NEXT: .int32 0
@tls = internal thread_local global i32 0 @tls = internal thread_local global i32 0
declare i32 @llvm.wasm.tls.size.i32() declare i32 @llvm.wasm.tls.size.i32()
declare i8* @llvm.wasm.tls.base() declare i8* @llvm.wasm.tls.base()