[llvm] [NVPTX] Add support for calling aliases (PR #81170)
Alex MacLean via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 8 12:31:51 PST 2024
https://github.com/AlexMaclean updated https://github.com/llvm/llvm-project/pull/81170
>From 5a54dbe3af19ec2a414c484244b846775fc3c425 Mon Sep 17 00:00:00 2001
From: Alex MacLean <amaclean at nvidia.com>
Date: Thu, 8 Feb 2024 02:09:09 +0000
Subject: [PATCH 1/2] [NVPTX] Add support for calling aliases
---
llvm/include/llvm/CodeGen/AsmPrinter.h | 2 +-
llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 2 +-
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp | 10 ----------
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h | 2 +-
llvm/test/CodeGen/NVPTX/alias.ll | 10 ++++++++++
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/llvm/include/llvm/CodeGen/AsmPrinter.h b/llvm/include/llvm/CodeGen/AsmPrinter.h
index fbd198a75a2436..a7fbf4aeb74494 100644
--- a/llvm/include/llvm/CodeGen/AsmPrinter.h
+++ b/llvm/include/llvm/CodeGen/AsmPrinter.h
@@ -897,7 +897,7 @@ class AsmPrinter : public MachineFunctionPass {
virtual void emitModuleCommandLines(Module &M);
GCMetadataPrinter *getOrCreateGCPrinter(GCStrategy &S);
- void emitGlobalAlias(Module &M, const GlobalAlias &GA);
+ virtual void emitGlobalAlias(const Module &M, const GlobalAlias &GA);
void emitGlobalIFunc(Module &M, const GlobalIFunc &GI);
private:
diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index b961fc2c338ae7..e89a1c26c23e6b 100644
--- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -2127,7 +2127,7 @@ void AsmPrinter::emitGlobalGOTEquivs() {
emitGlobalVariable(GV);
}
-void AsmPrinter::emitGlobalAlias(Module &M, const GlobalAlias &GA) {
+void AsmPrinter::emitGlobalAlias(const Module &M, const GlobalAlias &GA) {
MCSymbol *Name = getSymbol(&GA);
bool IsFunction = GA.getValueType()->isFunctionTy();
// Treat bitcasts of functions as functions also. This is important at least
diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
index 6c4879ba183c0a..3c52751721a3f7 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -932,16 +932,6 @@ bool NVPTXAsmPrinter::doFinalization(Module &M) {
GlobalsEmitted = true;
}
- // If we have any aliases we emit them at the end.
- SmallVector<GlobalAlias *> AliasesToRemove;
- for (GlobalAlias &Alias : M.aliases()) {
- emitGlobalAlias(M, Alias);
- AliasesToRemove.push_back(&Alias);
- }
-
- for (GlobalAlias *A : AliasesToRemove)
- A->eraseFromParent();
-
// call doFinalization
bool ret = AsmPrinter::doFinalization(M);
diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
index 7f0f37e7207d2d..cfd32ba72e5cf0 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -174,7 +174,7 @@ class LLVM_LIBRARY_VISIBILITY NVPTXAsmPrinter : public AsmPrinter {
void printModuleLevelGV(const GlobalVariable *GVar, raw_ostream &O,
bool processDemoted, const NVPTXSubtarget &STI);
void emitGlobals(const Module &M);
- void emitGlobalAlias(const Module &M, const GlobalAlias &GA);
+ void emitGlobalAlias(const Module &M, const GlobalAlias &GA) override;
void emitHeader(Module &M, raw_ostream &O, const NVPTXSubtarget &STI);
void emitKernelFunctionDirectives(const Function &F, raw_ostream &O) const;
void emitVirtualRegister(unsigned int vr, raw_ostream &);
diff --git a/llvm/test/CodeGen/NVPTX/alias.ll b/llvm/test/CodeGen/NVPTX/alias.ll
index d5dc3a12029ae6..df1b7647b49258 100644
--- a/llvm/test/CodeGen/NVPTX/alias.ll
+++ b/llvm/test/CodeGen/NVPTX/alias.ll
@@ -12,6 +12,12 @@ define void @noreturn() #0 {
}
@noreturn_alias = alias i32 (), ptr @noreturn
+define i32 @z() {
+ %val = call i32 @b()
+ ret i32 %val
+}
+
+
attributes #0 = { noreturn }
; CHECK: .visible .func (.param .b32 func_retval0) a()
@@ -24,6 +30,10 @@ attributes #0 = { noreturn }
; CHECK: .visible .func noreturn()
; CHECK-NEXT: .noreturn
+; CHECK: .visible .func (.param .b32 func_retval0) z()
+; CHECK: call.uni (retval0),
+; CHECK-NEXT: b,
+
; CHECK: .visible .func (.param .b32 func_retval0) b();
; CHECK-NEXT: .alias b, a;
>From f95b8195d1dd848a47b7639ebe09e679d5a8ac3d Mon Sep 17 00:00:00 2001
From: Alex MacLean <amaclean at nvidia.com>
Date: Thu, 8 Feb 2024 20:31:18 +0000
Subject: [PATCH 2/2] fixup after ptxas check
---
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp | 43 +++++++++++++----------
llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h | 3 ++
llvm/test/CodeGen/NVPTX/alias.ll | 38 ++++++++++++--------
3 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
index 3c52751721a3f7..b87144eb905df9 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.cpp
@@ -57,6 +57,7 @@
#include "llvm/IR/DebugLoc.h"
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalAlias.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/IR/GlobalVariable.h"
#include "llvm/IR/Instruction.h"
@@ -605,14 +606,32 @@ void NVPTXAsmPrinter::emitVirtualRegister(unsigned int vr,
O << getVirtualRegisterName(vr);
}
+void NVPTXAsmPrinter::emitAliasDeclaration(const GlobalAlias *GA,
+ raw_ostream &O) {
+ const Function *F = dyn_cast<Function>(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'");
+
+ emitDeclarationWithName(F, getSymbol(GA), O);
+}
+
void NVPTXAsmPrinter::emitDeclaration(const Function *F, raw_ostream &O) {
+ emitDeclarationWithName(F, getSymbol(F), O);
+}
+
+void NVPTXAsmPrinter::emitDeclarationWithName(const Function *F, MCSymbol *S,
+ raw_ostream &O) {
emitLinkageDirective(F, O);
if (isKernelFunction(*F))
O << ".entry ";
else
O << ".func ";
printReturnValStr(F, O);
- getSymbol(F)->print(O, MAI);
+ S->print(O, MAI);
O << "\n";
emitFunctionParamList(F, O);
O << "\n";
@@ -759,6 +778,8 @@ void NVPTXAsmPrinter::emitDeclarations(const Module &M, raw_ostream &O) {
}
seenMap[&F] = true;
}
+ for (const GlobalAlias &GA : M.aliases())
+ emitAliasDeclaration(&GA, O);
}
static bool isEmptyXXStructor(GlobalVariable *GV) {
@@ -853,25 +874,9 @@ void NVPTXAsmPrinter::emitGlobalAlias(const Module &M, const GlobalAlias &GA) {
raw_svector_ostream OS(Str);
MCSymbol *Name = getSymbol(&GA);
- const Function *F = dyn_cast<Function>(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);
- if (shouldEmitPTXNoReturn(F, TM))
- OS << "\n.noreturn";
- OS << ";\n";
- OS << ".alias " << Name->getName() << ", " << F->getName() << ";\n";
+ OS << ".alias " << Name->getName() << ", " << GA.getAliasee()->getName()
+ << ";\n";
OutStreamer->emitRawText(OS.str());
}
diff --git a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
index cfd32ba72e5cf0..979d185a97f799 100644
--- a/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
+++ b/llvm/lib/Target/NVPTX/NVPTXAsmPrinter.h
@@ -27,6 +27,7 @@
#include "llvm/IR/DebugLoc.h"
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/Function.h"
+#include "llvm/IR/GlobalAlias.h"
#include "llvm/IR/GlobalValue.h"
#include "llvm/IR/Value.h"
#include "llvm/MC/MCExpr.h"
@@ -222,6 +223,8 @@ class LLVM_LIBRARY_VISIBILITY NVPTXAsmPrinter : public AsmPrinter {
void emitLinkageDirective(const GlobalValue *V, raw_ostream &O);
void emitDeclarations(const Module &, raw_ostream &O);
void emitDeclaration(const Function *, raw_ostream &O);
+ void emitAliasDeclaration(const GlobalAlias *, raw_ostream &O);
+ void emitDeclarationWithName(const Function *, MCSymbol *, raw_ostream &O);
void emitDemotedVars(const Function *, raw_ostream &);
bool lowerImageHandleOperand(const MachineInstr *MI, unsigned OpNo,
diff --git a/llvm/test/CodeGen/NVPTX/alias.ll b/llvm/test/CodeGen/NVPTX/alias.ll
index df1b7647b49258..dbc1e64e31de57 100644
--- a/llvm/test/CodeGen/NVPTX/alias.ll
+++ b/llvm/test/CodeGen/NVPTX/alias.ll
@@ -1,4 +1,5 @@
; RUN: llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx64 | FileCheck %s
+; RUN: %if ptxas %{ llc < %s -march=nvptx64 -mcpu=sm_30 -mattr=+ptx64 | %ptxas-verify %}
define i32 @a() { ret i32 0 }
@b = internal alias i32 (), ptr @a
@@ -20,6 +21,25 @@ define i32 @z() {
attributes #0 = { noreturn }
+; CHECK: .visible .func (.param .b32 func_retval0) b
+; CHECK-NEXT: ()
+; CHECK-NEXT: ;
+
+; CHECK: .visible .func (.param .b32 func_retval0) c
+; CHECK-NEXT: ()
+; CHECK-NEXT: ;
+
+; CHECK: .visible .func bar
+; CHECK-NEXT: (
+; CHECK-NEXT: .param .b32 foo_param_0,
+; CHECK-NEXT: .param .b64 foo_param_1
+; CHECK-NEXT: )
+; CHECK-NEXT: ;
+
+; CHECK: .visible .func noreturn_alias
+; CHECK-NEXT: ()
+; CHECK-NEXT: .noreturn;
+
; CHECK: .visible .func (.param .b32 func_retval0) a()
; CHECK: .visible .func foo(
@@ -34,18 +54,8 @@ attributes #0 = { noreturn }
; CHECK: call.uni (retval0),
; CHECK-NEXT: b,
-; 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;
-; CHECK: .visible .func noreturn_alias()
-; CHECK-NEXT: .noreturn;
-; CHECK-NEXT: .alias noreturn_alias, noreturn;
+; CHECK: .alias b, a;
+; CHECK: .alias c, a;
+; CHECK: .alias bar, foo;
+; CHECK: .alias noreturn_alias, noreturn;
More information about the llvm-commits
mailing list