[PATCH] D155211: [NVPTX] Add initial support for '.alias' in PTX
This revision was automatically updated to reflect the committed changes.
Closed by commit rGf4381d464457: [NVPTX] Add initial support for
.alias in PTX (authored by jhuber6).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155211/new/
https://reviews.llvm.org/D155211
Files:
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
llvm/test/CodeGen/NVPTX/alias-errors.ll
llvm/test/CodeGen/NVPTX/alias.ll
Index: llvm/test/CodeGen/NVPTX/alias.ll
===
--- llvm/test/CodeGen/NVPTX/alias.ll
+++ llvm/test/CodeGen/NVPTX/alias.ll
@@ -1,7 +1,27 @@
-; RUN: not --crash llc < %s -march=nvptx -mcpu=sm_20 2>&1 | FileCheck %s
-
-; Check that llc dies gracefully when given an alias.
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 | FileCheck %s
define i32 @a() { ret i32 0 }
-; CHECK: ERROR: Module has aliases
@b = internal alias i32 (), ptr @a
+@c = internal alias i32 (), ptr @a
+
+define void @foo(i32 %0, ptr %1) { ret void }
+@bar = alias i32 (), ptr @foo
+
+; CHECK: .visible .func (.param .b32 func_retval0) a()
+
+; CHECK: .visible .func foo(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: )
+
+; CHECK: .visible .func (.param .b32 func_retval0) b();
+; CHECK-NEXT: .alias b, a;
+
+; CHECK: .visible .func (.param .b32 func_retval0) c();
+; CHECK-NEXT: .alias c, a;
+
+; CHECK: .visible .func bar(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: );
+; CHECK-NEXT: .alias bar, foo;
Index: llvm/test/CodeGen/NVPTX/alias-errors.ll
===
--- /dev/null
+++ llvm/test/CodeGen/NVPTX/alias-errors.ll
@@ -0,0 +1,9 @@
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx43 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_20 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ALIAS
+
+; ATTR: .alias requires PTX version >= 6.3 and sm_30
+
+; ALIAS: NVPTX aliasee must be a non-kernel function
+@a = global i32 42, align 8
+@b = internal alias i32, ptr @a
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -174,6 +174,7 @@
void printModuleLevelGV(const GlobalVariable *GVar, raw_ostream ,
bool processDemoted, const NVPTXSubtarget );
void emitGlobals(const Module );
+ void emitGlobalAlias(const Module , const GlobalAlias );
void emitHeader(Module , raw_ostream , const NVPTXSubtarget );
void emitKernelFunctionDirectives(const Function , raw_ostream ) const;
void emitVirtualRegister(unsigned int vr, raw_ostream &);
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -473,6 +473,7 @@
CurrentFnSym->print(O, MAI);
emitFunctionParamList(F, O);
+ O << "\n";
if (isKernelFunction(*F))
emitKernelFunctionDirectives(*F, O);
@@ -623,6 +624,7 @@
getSymbol(F)->print(O, MAI);
O << "\n";
emitFunctionParamList(F, O);
+ O << "\n";
if (shouldEmitPTXNoReturn(F, TM))
O << ".noreturn";
O << ";\n";
@@ -790,10 +792,12 @@
}
bool NVPTXAsmPrinter::doInitialization(Module ) {
- if (M.alias_size()) {
-report_fatal_error("Module has aliases, which NVPTX does not support.");
-return true; // error
- }
+ const NVPTXTargetMachine = static_cast(TM);
+ const NVPTXSubtarget =
+ *static_cast(NTM.getSubtargetImpl());
+ if (M.alias_size() && (STI.getPTXVersion() < 63 || STI.getSmVersion() < 30))
+report_fatal_error(".alias requires PTX version >= 6.3 and sm_30");
+
if (!isEmptyXXStructor(M.getNamedGlobal("llvm.global_ctors")) &&
!LowerCtorDtor) {
report_fatal_error(
@@ -850,6 +854,32 @@
OutStreamer->emitRawText(OS2.str());
}
+void NVPTXAsmPrinter::emitGlobalAlias(const Module , const GlobalAlias ) {
+ SmallString<128> Str;
+ raw_svector_ostream OS(Str);
+
+ MCSymbol *Name = getSymbol();
+ const Function *F = dyn_cast(GA.getAliasee());
+ if (!F || isKernelFunction(*F))
+report_fatal_error("NVPTX aliasee must be a non-kernel function");
+
+ if (GA.hasLinkOnceLinkage() || GA.hasWeakLinkage() ||
+ GA.hasAvailableExternallyLinkage() || GA.hasCommonLinkage())
+report_fatal_error("NVPTX aliasee must not be '.weak'");
+
+ OS << "\n";
+ emitLinkageDirective(F, OS);
+ OS << ".func ";
+ printReturnValStr(F, OS);
+ OS << Name->getName();
+ emitFunctionParamList(F, OS);
+ OS << ";\n";
+
+ OS << ".alias " <<
[PATCH] D155211: [NVPTX] Add initial support for '.alias' in PTX
jhuber6 updated this revision to Diff 540062.
jhuber6 added a comment.
Remove changes in `clang` that I forgot to remove to keep this restricted to
the codegen. Afterwards we can remove the sema in clang and test it there.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D155211/new/
https://reviews.llvm.org/D155211
Files:
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
llvm/test/CodeGen/NVPTX/alias-errors.ll
llvm/test/CodeGen/NVPTX/alias.ll
Index: llvm/test/CodeGen/NVPTX/alias.ll
===
--- llvm/test/CodeGen/NVPTX/alias.ll
+++ llvm/test/CodeGen/NVPTX/alias.ll
@@ -1,7 +1,27 @@
-; RUN: not --crash llc < %s -march=nvptx -mcpu=sm_20 2>&1 | FileCheck %s
-
-; Check that llc dies gracefully when given an alias.
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 | FileCheck %s
define i32 @a() { ret i32 0 }
-; CHECK: ERROR: Module has aliases
@b = internal alias i32 (), ptr @a
+@c = internal alias i32 (), ptr @a
+
+define void @foo(i32 %0, ptr %1) { ret void }
+@bar = alias i32 (), ptr @foo
+
+; CHECK: .visible .func (.param .b32 func_retval0) a()
+
+; CHECK: .visible .func foo(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: )
+
+; CHECK: .visible .func (.param .b32 func_retval0) b();
+; CHECK-NEXT: .alias b, a;
+
+; CHECK: .visible .func (.param .b32 func_retval0) c();
+; CHECK-NEXT: .alias c, a;
+
+; CHECK: .visible .func bar(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: );
+; CHECK-NEXT: .alias bar, foo;
Index: llvm/test/CodeGen/NVPTX/alias-errors.ll
===
--- /dev/null
+++ llvm/test/CodeGen/NVPTX/alias-errors.ll
@@ -0,0 +1,9 @@
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx43 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_20 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ALIAS
+
+; ATTR: .alias requires PTX version >= 6.3 and sm_30
+
+; ALIAS: NVPTX aliasee must be a non-kernel function
+@a = global i32 42, align 8
+@b = internal alias i32, ptr @a
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -174,6 +174,7 @@
void printModuleLevelGV(const GlobalVariable *GVar, raw_ostream ,
bool processDemoted, const NVPTXSubtarget );
void emitGlobals(const Module );
+ void emitGlobalAlias(const Module , const GlobalAlias );
void emitHeader(Module , raw_ostream , const NVPTXSubtarget );
void emitKernelFunctionDirectives(const Function , raw_ostream ) const;
void emitVirtualRegister(unsigned int vr, raw_ostream &);
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -473,6 +473,7 @@
CurrentFnSym->print(O, MAI);
emitFunctionParamList(F, O);
+ O << "\n";
if (isKernelFunction(*F))
emitKernelFunctionDirectives(*F, O);
@@ -623,6 +624,7 @@
getSymbol(F)->print(O, MAI);
O << "\n";
emitFunctionParamList(F, O);
+ O << "\n";
if (shouldEmitPTXNoReturn(F, TM))
O << ".noreturn";
O << ";\n";
@@ -790,10 +792,12 @@
}
bool NVPTXAsmPrinter::doInitialization(Module ) {
- if (M.alias_size()) {
-report_fatal_error("Module has aliases, which NVPTX does not support.");
-return true; // error
- }
+ const NVPTXTargetMachine = static_cast(TM);
+ const NVPTXSubtarget =
+ *static_cast(NTM.getSubtargetImpl());
+ if (M.alias_size() && (STI.getPTXVersion() < 63 || STI.getSmVersion() < 30))
+report_fatal_error(".alias requires PTX version >= 6.3 and sm_30");
+
if (!isEmptyXXStructor(M.getNamedGlobal("llvm.global_ctors")) &&
!LowerCtorDtor) {
report_fatal_error(
@@ -850,6 +854,32 @@
OutStreamer->emitRawText(OS2.str());
}
+void NVPTXAsmPrinter::emitGlobalAlias(const Module , const GlobalAlias ) {
+ SmallString<128> Str;
+ raw_svector_ostream OS(Str);
+
+ MCSymbol *Name = getSymbol();
+ const Function *F = dyn_cast(GA.getAliasee());
+ if (!F || isKernelFunction(*F))
+report_fatal_error("NVPTX aliasee must be a non-kernel function");
+
+ if (GA.hasLinkOnceLinkage() || GA.hasWeakLinkage() ||
+ GA.hasAvailableExternallyLinkage() || GA.hasCommonLinkage())
+report_fatal_error("NVPTX aliasee must not be '.weak'");
+
+ OS << "\n";
+ emitLinkageDirective(F, OS);
+ OS << ".func ";
+ printReturnValStr(F, OS);
+ OS << Name->getName();
+
[PATCH] D155211: [NVPTX] Add initial support for '.alias' in PTX
jhuber6 created this revision.
jhuber6 added reviewers: tra, arsenm, jlebar, kushanam.
Herald added subscribers: mattd, gchakrabarti, asavonic, jeroen.dobbelaere,
hiraditya.
Herald added a reviewer: aaron.ballman.
Herald added a project: All.
jhuber6 requested review of this revision.
Herald added subscribers: llvm-commits, cfe-commits, wangpc, wdng, jholewinski.
Herald added projects: clang, LLVM.
This patch adds initial support for using aliases when targeting PTX. We
perform a pretty strict conversion from the globals referenced to the
expected output.
These cannot currently be used due to a bug in the `nvlink`
implementation that causes aliases to pruned functions to crash the
linker.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D155211
Files:
clang/lib/Sema/SemaDeclAttr.cpp
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
llvm/test/CodeGen/NVPTX/alias-errors.ll
llvm/test/CodeGen/NVPTX/alias.ll
Index: llvm/test/CodeGen/NVPTX/alias.ll
===
--- llvm/test/CodeGen/NVPTX/alias.ll
+++ llvm/test/CodeGen/NVPTX/alias.ll
@@ -1,7 +1,27 @@
-; RUN: not --crash llc < %s -march=nvptx -mcpu=sm_20 2>&1 | FileCheck %s
-
-; Check that llc dies gracefully when given an alias.
+; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 | FileCheck %s
define i32 @a() { ret i32 0 }
-; CHECK: ERROR: Module has aliases
@b = internal alias i32 (), ptr @a
+@c = internal alias i32 (), ptr @a
+
+define void @foo(i32 %0, ptr %1) { ret void }
+@bar = alias i32 (), ptr @foo
+
+; CHECK: .visible .func (.param .b32 func_retval0) a()
+
+; CHECK: .visible .func foo(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: )
+
+; CHECK: .visible .func (.param .b32 func_retval0) b();
+; CHECK-NEXT: .alias b, a;
+
+; CHECK: .visible .func (.param .b32 func_retval0) c();
+; CHECK-NEXT: .alias c, a;
+
+; CHECK: .visible .func bar(
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: );
+; CHECK-NEXT: .alias bar, foo;
Index: llvm/test/CodeGen/NVPTX/alias-errors.ll
===
--- /dev/null
+++ llvm/test/CodeGen/NVPTX/alias-errors.ll
@@ -0,0 +1,9 @@
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx43 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_20 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ATTR
+; RUN: not --crash llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx63 2>&1 | FileCheck %s --check-prefix=ALIAS
+
+; ATTR: .alias requires PTX version >= 6.3 and sm_30
+
+; ALIAS: NVPTX aliasee must be a non-kernel function
+@a = global i32 42, align 8
+@b = internal alias i32, ptr @a
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -174,6 +174,7 @@
void printModuleLevelGV(const GlobalVariable *GVar, raw_ostream ,
bool processDemoted, const NVPTXSubtarget );
void emitGlobals(const Module );
+ void emitGlobalAlias(const Module , const GlobalAlias );
void emitHeader(Module , raw_ostream , const NVPTXSubtarget );
void emitKernelFunctionDirectives(const Function , raw_ostream ) const;
void emitVirtualRegister(unsigned int vr, raw_ostream &);
Index: llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
===
--- llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -473,6 +473,7 @@
CurrentFnSym->print(O, MAI);
emitFunctionParamList(F, O);
+ O << "\n";
if (isKernelFunction(*F))
emitKernelFunctionDirectives(*F, O);
@@ -623,6 +624,7 @@
getSymbol(F)->print(O, MAI);
O << "\n";
emitFunctionParamList(F, O);
+ O << "\n";
if (shouldEmitPTXNoReturn(F, TM))
O << ".noreturn";
O << ";\n";
@@ -790,10 +792,12 @@
}
bool NVPTXAsmPrinter::doInitialization(Module ) {
- if (M.alias_size()) {
-report_fatal_error("Module has aliases, which NVPTX does not support.");
-return true; // error
- }
+ const NVPTXTargetMachine = static_cast(TM);
+ const NVPTXSubtarget =
+ *static_cast(NTM.getSubtargetImpl());
+ if (M.alias_size() && (STI.getPTXVersion() < 63 || STI.getSmVersion() < 30))
+report_fatal_error(".alias requires PTX version >= 6.3 and sm_30");
+
if (!isEmptyXXStructor(M.getNamedGlobal("llvm.global_ctors")) &&
!LowerCtorDtor) {
report_fatal_error(
@@ -850,6 +854,32 @@
OutStreamer->emitRawText(OS2.str());
}
+void NVPTXAsmPrinter::emitGlobalAlias(const Module , const GlobalAlias ) {
+ SmallString<128> Str;
+ raw_svector_ostream OS(Str);
+
+ MCSymbol *Name = getSymbol();
+ const Function *F = dyn_cast(GA.getAliasee());
+
