[llvm] 410c7e4 - [RISCV] Do not re-validate target ABI in AsmParser if already resolved by streamer (#223606)
via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 16 23:01:09 PDT 2026
Author: Alexander Richardson
Date: 2026-09-17T06:01:03Z
New Revision: 410c7e42b81f4bcde4723a97014eaa4c0d21adb8
URL: https://github.com/llvm/llvm-project/commit/410c7e42b81f4bcde4723a97014eaa4c0d21adb8
DIFF: https://github.com/llvm/llvm-project/commit/410c7e42b81f4bcde4723a97014eaa4c0d21adb8.diff
LOG: [RISCV] Do not re-validate target ABI in AsmParser if already resolved by streamer (#223606)
Commit 105ff16f816f (https://github.com/llvm/llvm-project/pull/213410)
changed RISCVABI::computeTargetABI() to return Expected<ABI> and added
validation to RISCVAsmParser::onBeginOfFile() to report invalid
-target-abi flags with real source location in llvm-mc.
However, this broke LTO builds containing inline assembly (e.g. Android
riscv64 builds and downstream Rust in
https://github.com/rust-lang/rust/pull/162783). During LTO, LLD sets
TargetOptions.MCOptions.ABIName from the module's target-abi metadata
("lp64d"), while the linker's default TargetMachine subtarget lacks
"+d" (individual functions specify "+d" in target-features).
RISCVSubtarget handles this gracefully by emitting a diagnostic note
and falling back to lp64 for code generation. When inline assembly was
subsequently parsed, AsmPrinter::emitInlineAsm instantiated
RISCVAsmParser with a subtarget lacking "+d", causing onBeginOfFile() to
re-validate TargetOptions.ABIName and fail with a fatal error.
To fix this, skip the parser validation whenever the streamer has
already resolved an ABI. This preserves llvm-mc diagnostics on invalid
command-line flags while avoiding conflicting validation when assembling
inline asm during code generation.
This commit was created with the help of AI tools
Added:
Modified:
lld/test/ELF/lto/riscv-target-abi.ll
llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h
llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
Removed:
################################################################################
diff --git a/lld/test/ELF/lto/riscv-target-abi.ll b/lld/test/ELF/lto/riscv-target-abi.ll
index 07fdf122cb0c4..23f722e91a6fb 100644
--- a/lld/test/ELF/lto/riscv-target-abi.ll
+++ b/lld/test/ELF/lto/riscv-target-abi.ll
@@ -3,7 +3,8 @@
;; The module flag asks for lp64d, but without -mcpu we default to no D extension,
;; so we print a warning and ignore the module flag.
; RUN: llvm-as %s -o %t.bc
-; RUN: ld.lld -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=WARN --implicit-check-not="ignoring target-abi"
+; RUN: ld.lld -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=WARN \
+; RUN: --implicit-check-not="ignoring target-abi" --implicit-check-not="error:" --implicit-check-not="warning:"
; WARN: note: hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
;; TODO: This is inconsistent: RISCVAsmPrinter::emitStartOfAsmFile sets e_flags
@@ -15,9 +16,11 @@
; FLAGS-ABI-IGNORED-NEXT: ]
;; Passing -mcpu that has D makes the ABI valid again, so no warning.
-; RUN: ld.lld -mllvm -mcpu=sifive-u74 -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=NOWARN --allow-empty
+; RUN: ld.lld -mllvm -mcpu=sifive-u74 -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=NOWARN --allow-empty \
+; RUN: --implicit-check-not="error:" --implicit-check-not="warning:"
; RUN: llvm-readobj --file-headers %t.so | FileCheck %s --check-prefix=FLAGS-MCPU
-; RUN: ld.lld -plugin-opt=mcpu=sifive-u74 -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=NOWARN --allow-empty
+; RUN: ld.lld -plugin-opt=mcpu=sifive-u74 -shared %t.bc -o %t.so 2>&1 | FileCheck %s --check-prefix=NOWARN --allow-empty \
+; RUN: --implicit-check-not="error:" --implicit-check-not="warning:"
; RUN: llvm-readobj --file-headers %t.so | FileCheck %s --check-prefix=FLAGS-MCPU
; NOWARN-NOT: ignoring target-abi
; FLAGS-MCPU: Flags [ (0x5)
@@ -28,7 +31,14 @@
target datalayout = "e-m:e-p:64:64-i64:64-i128:128-n64-S128"
target triple = "riscv64"
+module asm "nop"
+;; Module asm with target features not including 'd' (would fail before fix)
+module asm(target_features: "+c") "c.nop"
+;; Module asm with target features enabling 'd'
+module asm(target_features: "+d") "fld f0, 0(sp)"
+
define void @_start() {
+ call void asm sideeffect "nop", ""()
ret void
}
diff --git a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
index ec61a03b5b3e7..4f610a49f9699 100644
--- a/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
+++ b/llvm/lib/Target/RISCV/AsmParser/RISCVAsmParser.cpp
@@ -343,10 +343,21 @@ class RISCVAsmParser : public MCTargetAsmParser {
// with the first token, so diagnostics can be reported with a real source
// location instead of being printed with no location information.
void onBeginOfFile() override {
+ // If the target streamer already has a resolved ABI (e.g. set by
+ // RISCVTargetELFStreamer for a valid -target-abi, or set by
+ // RISCVAsmPrinter during codegen), skip ABI validation.
+ if (getTargetStreamer().hasTargetABI())
+ return;
+
Expected<RISCVABI::ABI> ABIOrErr =
RISCVABI::computeTargetABI(getSTI(), getTargetOptions().ABIName);
- if (!ABIOrErr)
+ if (!ABIOrErr) {
getParser().printError(getLoc(), toString(ABIOrErr.takeError()));
+ getTargetStreamer().setTargetABI(
+ cantFail(RISCVABI::computeTargetABI(getSTI(), "")));
+ return;
+ }
+ getTargetStreamer().setTargetABI(*ABIOrErr);
}
};
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
index 049123068070f..1fb45627a1d03 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVELFStreamer.cpp
@@ -40,12 +40,10 @@ RISCVTargetELFStreamer::RISCVTargetELFStreamer(MCStreamer &S,
if (auto ABIOrErr = RISCVABI::computeTargetABI(STI, ABIName)) {
setTargetABI(*ABIOrErr);
} else {
- // Do not warn here and instead silently fall back to the default ABI:
- // either RISCVSubtarget::initializeSubtargetDependencies() or
- // RISCVAsmParser::onBeginOfFile() will print the message with proper
- // contexts. Reporting here would just duplicate that diagnostic.
+ // Do not set TargetABI here if invalid: RISCVSubtarget/RISCVAsmPrinter
+ // (in codegen) or RISCVAsmParser::onBeginOfFile() (in llvm-mc) will
+ // resolve or diagnose it with proper contexts.
consumeError(ABIOrErr.takeError());
- setTargetABI(cantFail(RISCVABI::computeTargetABI(STI, "")));
}
setFlagsFromFeatures(STI);
diff --git a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h
index 0601cf0ed0362..cd59089fae4c7 100644
--- a/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h
+++ b/llvm/lib/Target/RISCV/MCTargetDesc/RISCVTargetStreamer.h
@@ -63,6 +63,7 @@ class RISCVTargetStreamer : public MCTargetStreamer {
void emitTargetAttributes(const MCSubtargetInfo &STI, bool EmitStackAlign);
void setTargetABI(RISCVABI::ABI ABI);
RISCVABI::ABI getTargetABI() const { return TargetABI; }
+ bool hasTargetABI() const { return TargetABI != RISCVABI::ABI_Unknown; }
void setFlagsFromFeatures(const MCSubtargetInfo &STI);
bool hasRVC() const { return HasRVC; }
bool hasTSO() const { return HasTSO; }
diff --git a/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp b/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
index b535404d25c1f..04da2ce2b2bfe 100644
--- a/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
+++ b/llvm/lib/Target/RISCV/RISCVAsmPrinter.cpp
@@ -649,6 +649,9 @@ void RISCVAsmPrinter::emitStartOfAsmFile(Module &M) {
if (const MDString *ModuleTargetABI =
dyn_cast_or_null<MDString>(M.getModuleFlag("target-abi")))
RTS.setTargetABI(RISCVABI::getTargetABI(ModuleTargetABI->getString()));
+ else if (!RTS.hasTargetABI())
+ RTS.setTargetABI(
+ cantFail(RISCVABI::computeTargetABI(TM.getMCSubtargetInfo(), "")));
MCSubtargetInfo SubtargetInfo = TM.getMCSubtargetInfo();
More information about the llvm-commits
mailing list