Skip to content

Commit 4f94c4f

Browse files
futoglenary
andcommitted
Apply suggestions from code review
Co-authored-by: Sam Elliott <[email protected]>
1 parent 11ccb9e commit 4f94c4f

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22569,9 +22569,7 @@ SDValue RISCVTargetLowering::LowerFormalArguments(
2256922569
"'SiFive-CLIC-*' interrupt kinds require XSfmclic extension");
2257022570

2257122571
if (Kind == "rnmi" && !Subtarget.hasStdExtSmrnmi())
22572-
reportFatalUsageError("Handling of resumable non-maskable interrupts "
22573-
"handling requires Smrnmi extension");
22574-
22572+
reportFatalUsageError("'rnmi' interrupt kind requires Srnmi extension");
2257522573
const TargetFrameLowering *TFI = Subtarget.getFrameLowering();
2257622574
if (Kind.starts_with("SiFive-CLIC-preemptible") && TFI->hasFP(MF))
2257722575
reportFatalUsageError("'SiFive-CLIC-preemptible' interrupt kinds cannot "

llvm/lib/Target/RISCV/RISCVInstrInfo.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def riscv_sret_glue : RVSDNode<"SRET_GLUE", SDTNone,
7676
def riscv_mret_glue : RVSDNode<"MRET_GLUE", SDTNone,
7777
[SDNPHasChain, SDNPOptInGlue]>;
7878
def riscv_mnret_glue : RVSDNode<"MNRET_GLUE", SDTNone,
79-
[SDNPHasChain, SDNPOptInGlue]>;
79+
[SDNPHasChain, SDNPOptInGlue]>;
8080
def riscv_mileaveret_glue : RVSDNode<"QC_C_MILEAVERET_GLUE", SDTNone,
8181
[SDNPHasChain, SDNPOptInGlue]>;
8282

llvm/test/CodeGen/RISCV/rnmi-interrupt-attr-error.ll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
; RUN: not llc -mtriple riscv64-unknown-elf -mattr=-smrnmi -o - %s 2>&1 \
44
; RUN: | FileCheck %s
55

6-
; CHECK: LLVM ERROR: Handling of resumable non-maskable interrupts handling requires Smrnmi extension
6+
; CHECK: LLVM ERROR: 'rnmi' interrupt kind requires Srnmi extension
77
define void @test_rnmi() "interrupt"="rnmi" {
88
ret void
99
}

0 commit comments

Comments
 (0)