Skip to content

[WebAssembly] Remove threadlocal.address when disabling TLS #88209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 10, 2024
Merged

[WebAssembly] Remove threadlocal.address when disabling TLS #88209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1894bcc
WebAssembly: Remove threadlocal_address intrinsics when disabling TLS
MatzeB Apr 9, 2024
37e734c
integrate with existing test instead
MatzeB Apr 10, 2024
cfe1cf9
Just add llvm.threadlocal.address to other tests
MatzeB Apr 10, 2024
e4737aa
Iterate over uses of GlobalVariable instead of all instructions
MatzeB Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions llvm/lib/Target/WebAssembly/WebAssemblyTargetMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,17 @@ class CoalesceFeaturesAndStripAtomics final : public ModulePass {
bool Stripped = false;
for (auto &GV : M.globals()) {
if (GV.isThreadLocal()) {
// replace `@llvm.threadlocal.address.pX(GV)` with `GV`.
for (Use &U : make_early_inc_range(GV.uses())) {
if (IntrinsicInst *II = dyn_cast<IntrinsicInst>(U.getUser())) {
if (II->getIntrinsicID() == Intrinsic::threadlocal_address &&
II->getArgOperand(0) == &GV) {
II->replaceAllUsesWith(&GV);
II->eraseFromParent();
}
}
}

Stripped = true;
GV.setThreadLocal(false);
}
Expand Down
26 changes: 18 additions & 8 deletions llvm/test/CodeGen/WebAssembly/tls-general-dynamic.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ define i32 @address_of_tls() {

; NO-TLS-NEXT: i32.const tls
; NO-TLS-NEXT: return
ret i32 ptrtoint(ptr @tls to i32)
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
%r = ptrtoint ptr %p to i32
ret i32 %r
}

; CHECK-LABEL: address_of_tls_external:
Expand All @@ -25,7 +27,9 @@ define i32 @address_of_tls_external() {

; NO-TLS-NEXT: i32.const tls_external
; NO-TLS-NEXT: return
ret i32 ptrtoint(ptr @tls_external to i32)
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls_external)
%r = ptrtoint ptr %p to i32
ret i32 %r
}

; CHECK-LABEL: ptr_to_tls:
Expand All @@ -38,7 +42,8 @@ define ptr @ptr_to_tls() {

; NO-TLS-NEXT: i32.const tls
; NO-TLS-NEXT: return
ret ptr @tls
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
ret ptr %p
}

; CHECK-LABEL: ptr_to_tls_external:
Expand All @@ -49,7 +54,8 @@ define ptr @ptr_to_tls_external() {

; NO-TLS-NEXT: i32.const tls_external
; NO-TLS-NEXT: return
ret ptr @tls_external
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls_external)
ret ptr %p
}

; CHECK-LABEL: tls_load:
Expand All @@ -64,7 +70,8 @@ define i32 @tls_load() {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.load tls
; NO-TLS-NEXT: return
%tmp = load i32, ptr @tls, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
%tmp = load i32, ptr %p, align 4
ret i32 %tmp
}

Expand All @@ -78,7 +85,8 @@ define i32 @tls_load_external() {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.load tls_external
; NO-TLS-NEXT: return
%tmp = load i32, ptr @tls_external, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls_external)
%tmp = load i32, ptr %p, align 4
ret i32 %tmp
}

Expand All @@ -94,7 +102,8 @@ define void @tls_store(i32 %x) {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.store tls
; NO-TLS-NEXT: return
store i32 %x, ptr @tls, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
store i32 %x, ptr %p, align 4
ret void
}

Expand All @@ -108,7 +117,8 @@ define void @tls_store_external(i32 %x) {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.store tls_external
; NO-TLS-NEXT: return
store i32 %x, ptr @tls_external, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls_external)
store i32 %x, ptr %p, align 4
ret void
}

Expand Down
17 changes: 12 additions & 5 deletions llvm/test/CodeGen/WebAssembly/tls-local-exec.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ define i32 @address_of_tls() {

; NO-TLS-NEXT: i32.const tls
; NO-TLS-NEXT: return
ret i32 ptrtoint(ptr @tls to i32)
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
%r = ptrtoint ptr %p to i32
ret i32 %r
}

; CHECK-LABEL: address_of_tls_external:
Expand All @@ -33,7 +35,9 @@ define i32 @address_of_tls_external() {

; NO-TLS-NEXT: i32.const tls_external
; NO-TLS-NEXT: return
ret i32 ptrtoint(ptr @tls_external to i32)
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls_external)
%r = ptrtoint ptr %p to i32
ret i32 %r
}

; CHECK-LABEL: ptr_to_tls:
Expand All @@ -46,7 +50,8 @@ define ptr @ptr_to_tls() {

; NO-TLS-NEXT: i32.const tls
; NO-TLS-NEXT: return
ret ptr @tls
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
ret ptr %p
}

; CHECK-LABEL: tls_load:
Expand All @@ -61,7 +66,8 @@ define i32 @tls_load() {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.load tls
; NO-TLS-NEXT: return
%tmp = load i32, ptr @tls, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
%tmp = load i32, ptr %p, align 4
ret i32 %tmp
}

Expand All @@ -77,7 +83,8 @@ define void @tls_store(i32 %x) {
; NO-TLS-NEXT: i32.const 0
; NO-TLS-NEXT: i32.store tls
; NO-TLS-NEXT: return
store i32 %x, ptr @tls, align 4
%p = call ptr @llvm.threadlocal.address.p0(ptr @tls)
store i32 %x, ptr %p, align 4
ret void
}

Expand Down