brendandahl updated this revision to Diff 527218.
brendandahl marked an inline comment as done.
brendandahl added a comment.
Address comments.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D150803/new/
https://reviews.llvm.org/D150803
Files:
clang/docs/ReleaseNotes.rst
clang/include/clang/Basic/Attr.td
clang/include/clang/Basic/AttrDocs.td
clang/lib/CodeGen/TargetInfo.cpp
clang/lib/Sema/SemaDeclAttr.cpp
clang/test/CodeGen/WebAssembly/wasm-async.c
clang/test/Misc/pragma-attribute-supported-attributes-list.test
clang/test/Sema/attr-wasm-async.c
clang/test/Sema/wasm-async-support.c
lld/test/wasm/async.s
lld/test/wasm/merge-async-section.ll
lld/wasm/InputChunks.cpp
lld/wasm/InputFiles.cpp
llvm/include/llvm/BinaryFormat/WasmRelocs.def
llvm/include/llvm/MC/MCExpr.h
llvm/lib/MC/MCExpr.cpp
llvm/lib/MC/WasmObjectWriter.cpp
llvm/lib/Object/WasmObjectFile.cpp
llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.h
llvm/test/CodeGen/WebAssembly/async.ll
llvm/test/MC/WebAssembly/async.s
Index: llvm/test/MC/WebAssembly/async.s
===================================================================
--- /dev/null
+++ llvm/test/MC/WebAssembly/async.s
@@ -0,0 +1,21 @@
+# RUN: llvm-mc -triple=wasm32-unknown-unknown < %s | FileCheck %s
+# Check that it also comiled to object for format.
+# RUN: llvm-mc -triple=wasm32-unknown-unknown -filetype=obj -o - < %s | obj2yaml | FileCheck -check-prefix=CHECK-OBJ %s
+
+foo:
+ .globl foo
+ .functype foo () -> ()
+ end_function
+
+ .section .custom_section.async,"",@
+ .int32 foo@FUNCINDEX
+
+# CHECK: .section .custom_section.async,"",@
+# CHECK-NEXT: .int32 foo@FUNCINDEX
+
+# CHECK-OBJ: - Type: CUSTOM
+# CHECK-OBJ-NEXT: Relocations:
+# CHECK-OBJ-NEXT: - Type: R_WASM_FUNCTION_INDEX_I32
+# CHECK-OBJ-NEXT: Index: 0
+# CHECK-OBJ-NEXT: Offset: 0x0
+# CHECK-OBJ-NEXT: Name: async
Index: llvm/test/CodeGen/WebAssembly/async.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/WebAssembly/async.ll
@@ -0,0 +1,17 @@
+; RUN: llc < %s -asm-verbose=false -wasm-keep-registers | FileCheck %s
+
+target triple = "wasm32-unknown-unknown"
+
+define void @test0() #0 {
+ ret void
+}
+
+define void @test1() #0 {
+ ret void
+}
+
+attributes #0 = { "wasm-async" }
+
+; CHECK: .section .custom_section.async,"",@
+; CHECK-NEXT: .int32 test0@FUNCINDEX
+; CHECK-NEXT: .int32 test1@FUNCINDEX
Index: llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.h
===================================================================
--- llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.h
+++ llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.h
@@ -66,6 +66,7 @@
void emitEndOfAsmFile(Module &M) override;
void EmitProducerInfo(Module &M);
void EmitTargetFeatures(Module &M);
+ void EmitAsync(Module &M);
void emitSymbolType(const MCSymbolWasm *Sym);
void emitGlobalVariable(const GlobalVariable *GV) override;
void emitJumpTableInfo() override;
Index: llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
===================================================================
--- llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
+++ llvm/lib/Target/WebAssembly/WebAssemblyAsmPrinter.cpp
@@ -438,6 +438,7 @@
EmitProducerInfo(M);
EmitTargetFeatures(M);
+ EmitAsync(M);
}
void WebAssemblyAsmPrinter::EmitProducerInfo(Module &M) {
@@ -556,6 +557,32 @@
OutStreamer->popSection();
}
+void WebAssemblyAsmPrinter::EmitAsync(Module &M) {
+ SmallVector<MCSymbol *, 4> AsyncFuncs;
+
+ for (const auto &F : M) {
+ auto *Sym = cast<MCSymbolWasm>(getSymbol(&F));
+ if (F.hasFnAttribute("wasm-async"))
+ AsyncFuncs.push_back(Sym);
+ }
+ if (AsyncFuncs.size() == 0)
+ return;
+
+ MCSectionWasm *AsyncSection = OutContext.getWasmSection(
+ ".custom_section.async", SectionKind::getMetadata());
+ OutStreamer->pushSection();
+ OutStreamer->switchSection(AsyncSection);
+
+ for (auto &Sym : AsyncFuncs) {
+ OutStreamer->emitValue(
+ MCSymbolRefExpr::create(Sym, MCSymbolRefExpr::VK_WASM_FUNCINDEX,
+ OutContext),
+ 4);
+ }
+
+ OutStreamer->popSection();
+}
+
void WebAssemblyAsmPrinter::emitConstantPool() {
emitDecls(*MMI->getModule());
assert(MF->getConstantPool()->getConstants().empty() &&
Index: llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
===================================================================
--- llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
+++ llvm/lib/Target/WebAssembly/MCTargetDesc/WebAssemblyWasmObjectWriter.cpp
@@ -91,6 +91,8 @@
return wasm::R_WASM_TYPE_INDEX_LEB;
case MCSymbolRefExpr::VK_None:
break;
+ case MCSymbolRefExpr::VK_WASM_FUNCINDEX:
+ return wasm::R_WASM_FUNCTION_INDEX_I32;
default:
report_fatal_error("unknown VariantKind");
break;
Index: llvm/lib/Object/WasmObjectFile.cpp
===================================================================
--- llvm/lib/Object/WasmObjectFile.cpp
+++ llvm/lib/Object/WasmObjectFile.cpp
@@ -948,6 +948,7 @@
Reloc.Index = readVaruint32(Ctx);
switch (type) {
case wasm::R_WASM_FUNCTION_INDEX_LEB:
+ case wasm::R_WASM_FUNCTION_INDEX_I32:
case wasm::R_WASM_TABLE_INDEX_SLEB:
case wasm::R_WASM_TABLE_INDEX_SLEB64:
case wasm::R_WASM_TABLE_INDEX_I32:
@@ -1045,6 +1046,7 @@
Reloc.Type == wasm::R_WASM_MEMORY_ADDR_LOCREL_I32 ||
Reloc.Type == wasm::R_WASM_SECTION_OFFSET_I32 ||
Reloc.Type == wasm::R_WASM_FUNCTION_OFFSET_I32 ||
+ Reloc.Type == wasm::R_WASM_FUNCTION_INDEX_I32 ||
Reloc.Type == wasm::R_WASM_GLOBAL_INDEX_I32)
Size = 4;
if (Reloc.Type == wasm::R_WASM_TABLE_INDEX_I64 ||
Index: llvm/lib/MC/WasmObjectWriter.cpp
===================================================================
--- llvm/lib/MC/WasmObjectWriter.cpp
+++ llvm/lib/MC/WasmObjectWriter.cpp
@@ -671,6 +671,7 @@
// Provisional value is same as the index
return getRelocationIndexValue(RelEntry);
case wasm::R_WASM_FUNCTION_INDEX_LEB:
+ case wasm::R_WASM_FUNCTION_INDEX_I32:
case wasm::R_WASM_GLOBAL_INDEX_LEB:
case wasm::R_WASM_GLOBAL_INDEX_I32:
case wasm::R_WASM_TAG_INDEX_LEB:
@@ -791,6 +792,7 @@
case wasm::R_WASM_TABLE_INDEX_I32:
case wasm::R_WASM_MEMORY_ADDR_I32:
case wasm::R_WASM_FUNCTION_OFFSET_I32:
+ case wasm::R_WASM_FUNCTION_INDEX_I32:
case wasm::R_WASM_SECTION_OFFSET_I32:
case wasm::R_WASM_GLOBAL_INDEX_I32:
case wasm::R_WASM_MEMORY_ADDR_LOCREL_I32:
Index: llvm/lib/MC/MCExpr.cpp
===================================================================
--- llvm/lib/MC/MCExpr.cpp
+++ llvm/lib/MC/MCExpr.cpp
@@ -360,6 +360,7 @@
case VK_WASM_TLSREL: return "TLSREL";
case VK_WASM_TBREL: return "TBREL";
case VK_WASM_GOT_TLS: return "GOT@TLS";
+ case VK_WASM_FUNCINDEX: return "FUNCINDEX";
case VK_AMDGPU_GOTPCREL32_LO: return "gotpcrel32@lo";
case VK_AMDGPU_GOTPCREL32_HI: return "gotpcrel32@hi";
case VK_AMDGPU_REL32_LO: return "rel32@lo";
@@ -503,6 +504,7 @@
.Case("mbrel", VK_WASM_MBREL)
.Case("tlsrel", VK_WASM_TLSREL)
.Case("got@tls", VK_WASM_GOT_TLS)
+ .Case("funcindex", VK_WASM_FUNCINDEX)
.Case("gotpcrel32@lo", VK_AMDGPU_GOTPCREL32_LO)
.Case("gotpcrel32@hi", VK_AMDGPU_GOTPCREL32_HI)
.Case("rel32@lo", VK_AMDGPU_REL32_LO)
Index: llvm/include/llvm/MC/MCExpr.h
===================================================================
--- llvm/include/llvm/MC/MCExpr.h
+++ llvm/include/llvm/MC/MCExpr.h
@@ -330,6 +330,7 @@
VK_WASM_MBREL, // Memory address relative to __memory_base
VK_WASM_TBREL, // Table index relative to __table_base
VK_WASM_GOT_TLS, // Wasm global index of TLS symbol.
+ VK_WASM_FUNCINDEX, // Wasm function index.
VK_AMDGPU_GOTPCREL32_LO, // symbol@gotpcrel32@lo
VK_AMDGPU_GOTPCREL32_HI, // symbol@gotpcrel32@hi
Index: llvm/include/llvm/BinaryFormat/WasmRelocs.def
===================================================================
--- llvm/include/llvm/BinaryFormat/WasmRelocs.def
+++ llvm/include/llvm/BinaryFormat/WasmRelocs.def
@@ -28,3 +28,4 @@
WASM_RELOC(R_WASM_MEMORY_ADDR_LOCREL_I32, 23)
WASM_RELOC(R_WASM_TABLE_INDEX_REL_SLEB64, 24)
WASM_RELOC(R_WASM_MEMORY_ADDR_TLS_SLEB64, 25)
+WASM_RELOC(R_WASM_FUNCTION_INDEX_I32, 26)
Index: lld/wasm/InputFiles.cpp
===================================================================
--- lld/wasm/InputFiles.cpp
+++ lld/wasm/InputFiles.cpp
@@ -193,6 +193,7 @@
case R_WASM_TYPE_INDEX_LEB:
return typeMap[reloc.Index];
case R_WASM_FUNCTION_INDEX_LEB:
+ case R_WASM_FUNCTION_INDEX_I32:
return getFunctionSymbol(reloc.Index)->getFunctionIndex();
case R_WASM_GLOBAL_INDEX_LEB:
case R_WASM_GLOBAL_INDEX_I32:
Index: lld/wasm/InputChunks.cpp
===================================================================
--- lld/wasm/InputChunks.cpp
+++ lld/wasm/InputChunks.cpp
@@ -150,6 +150,7 @@
case R_WASM_TABLE_INDEX_I32:
case R_WASM_MEMORY_ADDR_I32:
case R_WASM_FUNCTION_OFFSET_I32:
+ case R_WASM_FUNCTION_INDEX_I32:
case R_WASM_SECTION_OFFSET_I32:
case R_WASM_GLOBAL_INDEX_I32:
case R_WASM_MEMORY_ADDR_LOCREL_I32:
Index: lld/test/wasm/merge-async-section.ll
===================================================================
--- /dev/null
+++ lld/test/wasm/merge-async-section.ll
@@ -0,0 +1,48 @@
+; RUN: split-file %s %t
+; RUN: llc -filetype=obj %t/a.ll -o %t1.o
+; RUN: llc -filetype=obj %t/b.ll -o %t2.o
+; RUN: wasm-ld -o %t.wasm %t1.o %t2.o
+; RUN: obj2yaml %t.wasm | FileCheck %s
+
+; Ensure two async sections are concatenated together.
+
+; CHECK: - Type: CUSTOM
+; CHECK-NEXT: Name: async
+; CHECK-NEXT: Payload: '000000000100000003000000'
+
+;--- a.ll
+
+target triple = "wasm32-unknown-unknown"
+
+; Function index 3 (after linking)
+declare void @baz()
+
+; Function index 0
+define void @foo() #0 {
+ ret void
+}
+
+; Function index 1
+define void @bar() #0 {
+ ret void
+}
+
+; Function index 2
+define void @_start() {
+ call void @foo()
+ call void @bar()
+ call void @baz()
+ ret void
+}
+
+attributes #0 = { "wasm-async" }
+
+;--- b.ll
+
+target triple = "wasm32-unknown-unknown"
+
+define void @baz() #0 {
+ ret void
+}
+
+attributes #0 = { "wasm-async" }
Index: lld/test/wasm/async.s
===================================================================
--- /dev/null
+++ lld/test/wasm/async.s
@@ -0,0 +1,35 @@
+# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
+# RUN: wasm-ld %t.o -o %t.wasm
+# RUN: obj2yaml %t.wasm | FileCheck %s
+
+ .functype foo () -> ()
+ .functype bar () -> ()
+ .functype _start () -> ()
+ .globl foo
+ .type foo,@function
+foo:
+ .functype foo () -> ()
+ end_function
+
+ .section .text.bar,"",@
+ .globl bar
+ .type bar,@function
+bar:
+ .functype bar () -> ()
+ end_function
+
+ .globl _start
+ .type _start,@function
+_start:
+ .functype _start () -> ()
+ call foo
+ call bar
+ end_function
+
+ .section .custom_section.async,"",@
+ .int32 foo@FUNCINDEX
+ .int32 bar@FUNCINDEX
+
+# CHECK: - Type: CUSTOM
+# CHECK-NEXT: Name: async
+# CHECK-NEXT: Payload: '0000000001000000'
Index: clang/test/Sema/wasm-async-support.c
===================================================================
--- /dev/null
+++ clang/test/Sema/wasm-async-support.c
@@ -0,0 +1,3 @@
+// RUN: %clang_cc1 %s -triple armv7 -fsyntax-only -verify
+
+void name_a(void) __attribute__((wasm_async)); // expected-warning{{unknown attribute 'wasm_async' ignored}}
Index: clang/test/Sema/attr-wasm-async.c
===================================================================
--- /dev/null
+++ clang/test/Sema/attr-wasm-async.c
@@ -0,0 +1,7 @@
+// RUN: %clang_cc1 -triple wasm32-unknown-unknown -fsyntax-only -verify %s
+
+void name_a(void) __attribute__((wasm_async));
+
+int name_b __attribute__((wasm_async)); //expected-error {{'wasm_async' attribute only applies to functions}}
+
+void name_c(void) __attribute__((wasm_async("foo"))); //expected-error {{'wasm_async' attribute takes no arguments}}
Index: clang/test/Misc/pragma-attribute-supported-attributes-list.test
===================================================================
--- clang/test/Misc/pragma-attribute-supported-attributes-list.test
+++ clang/test/Misc/pragma-attribute-supported-attributes-list.test
@@ -196,6 +196,7 @@
// CHECK-NEXT: WarnUnusedResult (SubjectMatchRule_objc_method, SubjectMatchRule_enum, SubjectMatchRule_record, SubjectMatchRule_hasType_functionType, SubjectMatchRule_type_alias)
// CHECK-NEXT: Weak (SubjectMatchRule_variable, SubjectMatchRule_function, SubjectMatchRule_record)
// CHECK-NEXT: WeakRef (SubjectMatchRule_variable, SubjectMatchRule_function)
+// CHECK-NEXT: WebAssemblyAsync (SubjectMatchRule_function)
// CHECK-NEXT: WebAssemblyExportName (SubjectMatchRule_function)
// CHECK-NEXT: WebAssemblyImportModule (SubjectMatchRule_function)
// CHECK-NEXT: WebAssemblyImportName (SubjectMatchRule_function)
Index: clang/test/CodeGen/WebAssembly/wasm-async.c
===================================================================
--- /dev/null
+++ clang/test/CodeGen/WebAssembly/wasm-async.c
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -triple wasm32-unknown-unknown-wasm -emit-llvm -o - %s | FileCheck %s
+
+__attribute__((wasm_async)) int foo(void) {
+ return 43;
+}
+
+// CHECK: define i32 @foo() [[A:#[0-9]+]]
+
+// CHECK: attributes [[A]] = {{{.*}} "wasm-async" {{.*}}}
Index: clang/lib/Sema/SemaDeclAttr.cpp
===================================================================
--- clang/lib/Sema/SemaDeclAttr.cpp
+++ clang/lib/Sema/SemaDeclAttr.cpp
@@ -7633,6 +7633,11 @@
FD->addAttr(::new (S.Context) WebAssemblyImportNameAttr(S.Context, AL, Str));
}
+static void handleWebAssemblyAsyncAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
+ D->addAttr(::new (S.Context) WebAssemblyAsyncAttr(S.Context, AL));
+ D->addAttr(UsedAttr::CreateImplicit(S.Context));
+}
+
static void handleRISCVInterruptAttr(Sema &S, Decl *D,
const ParsedAttr &AL) {
// Warn about repeated attributes.
@@ -8739,6 +8744,9 @@
case ParsedAttr::AT_WebAssemblyImportName:
handleWebAssemblyImportNameAttr(S, D, AL);
break;
+ case ParsedAttr::AT_WebAssemblyAsync:
+ handleWebAssemblyAsyncAttr(S, D, AL);
+ break;
case ParsedAttr::AT_IBOutlet:
handleIBOutlet(S, D, AL);
break;
Index: clang/lib/CodeGen/TargetInfo.cpp
===================================================================
--- clang/lib/CodeGen/TargetInfo.cpp
+++ clang/lib/CodeGen/TargetInfo.cpp
@@ -889,11 +889,17 @@
Fn->addFnAttrs(B);
}
if (const auto *Attr = FD->getAttr<WebAssemblyExportNameAttr>()) {
- llvm::Function *Fn = cast<llvm::Function>(GV);
+ auto *Fn = cast<llvm::Function>(GV);
llvm::AttrBuilder B(GV->getContext());
B.addAttribute("wasm-export-name", Attr->getExportName());
Fn->addFnAttrs(B);
}
+ if (FD->getAttr<WebAssemblyAsyncAttr>()) {
+ llvm::Function *Fn = cast<llvm::Function>(GV);
+ llvm::AttrBuilder B(GV->getContext());
+ B.addAttribute("wasm-async");
+ Fn->addFnAttrs(B);
+ }
}
if (auto *FD = dyn_cast_or_null<FunctionDecl>(D)) {
Index: clang/include/clang/Basic/AttrDocs.td
===================================================================
--- clang/include/clang/Basic/AttrDocs.td
+++ clang/include/clang/Basic/AttrDocs.td
@@ -5602,6 +5602,21 @@
}];
}
+def WebAssemblyAsyncDocs : Documentation {
+ let Category = DocCatFunction;
+ let Content = [{
+Clang supports the ``__attribute__((wasm_async))`` attribute for the WebAssembly
+target. This attribute may be attached to a function, which indicates to external
+tooling (e.g. binaryen) that the function should have JavaScript promise
+integration (JSPI) wrappers applied to it. The attribute will cause the creation
+of a custom section named "async" that contains each wasm_async function's index
+value.
+More information:
+https://github.com/WebAssembly/js-promise-integration/blob/main/proposals/js-promise-integration/Overview.md
+https://github.com/WebAssembly/binaryen/blob/main/src/passes/JSPI.cpp
+ }];
+}
+
def ArtificialDocs : Documentation {
let Category = DocCatFunction;
let Content = [{
Index: clang/include/clang/Basic/Attr.td
===================================================================
--- clang/include/clang/Basic/Attr.td
+++ clang/include/clang/Basic/Attr.td
@@ -1979,6 +1979,13 @@
let Subjects = SubjectList<[Function], ErrorDiag>;
}
+def WebAssemblyAsync : InheritableAttr,
+ TargetSpecificAttr<TargetWebAssembly> {
+ let Spellings = [Clang<"wasm_async">];
+ let Documentation = [WebAssemblyAsyncDocs];
+ let Subjects = SubjectList<[Function], ErrorDiag>;
+}
+
def NoSplitStack : InheritableAttr {
let Spellings = [GCC<"no_split_stack">];
let Subjects = SubjectList<[Function], ErrorDiag>;
Index: clang/docs/ReleaseNotes.rst
===================================================================
--- clang/docs/ReleaseNotes.rst
+++ clang/docs/ReleaseNotes.rst
@@ -556,6 +556,8 @@
WebAssembly Support
^^^^^^^^^^^^^^^^^^^
+- Added ``attribute((wasm_async))`` to indicate that a function should be used with
+ JavaScript Promise Integration (JSPI).
AVR Support
^^^^^^^^^^^
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
