Skip to content

Commit e821f64

Browse files
committed
Revert "[AMDGPU][CodeGen] Do not backtrace invalid -regalloc param (#119687)"
Causes bot failure: https://lab.llvm.org/buildbot/#/builders/55/builds/4246/steps/11/logs/stdio This reverts commit 7a64855.
1 parent a222d00 commit e821f64

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ static const char RegAllocOptNotSupportedMessage[] =
15601560

15611561
bool GCNPassConfig::addRegAssignAndRewriteFast() {
15621562
if (!usingDefaultRegAlloc())
1563-
report_fatal_error(RegAllocOptNotSupportedMessage, /*GenCrashDiag=*/false);
1563+
report_fatal_error(RegAllocOptNotSupportedMessage);
15641564

15651565
addPass(&GCNPreRALongBranchRegID);
15661566

@@ -1586,7 +1586,7 @@ bool GCNPassConfig::addRegAssignAndRewriteFast() {
15861586

15871587
bool GCNPassConfig::addRegAssignAndRewriteOptimized() {
15881588
if (!usingDefaultRegAlloc())
1589-
report_fatal_error(RegAllocOptNotSupportedMessage, /*GenCrashDiag=*/false);
1589+
report_fatal_error(RegAllocOptNotSupportedMessage);
15901590

15911591
addPass(&GCNPreRALongBranchRegID);
15921592

llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
; RUN: llc -verify-machineinstrs=0 -sgpr-regalloc=basic -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=BASIC-DEFAULT %s
1010
; RUN: llc -verify-machineinstrs=0 -sgpr-regalloc=basic -wwm-regalloc=basic -vgpr-regalloc=basic -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=BASIC-BASIC %s
1111

12-
; RUN: not llc -verify-machineinstrs=0 -regalloc=basic -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=REGALLOC %s
13-
; RUN: not llc -verify-machineinstrs=0 -regalloc=fast -O0 -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=REGALLOC %s
12+
; RUN: not --crash llc -verify-machineinstrs=0 -regalloc=basic -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=REGALLOC %s
13+
; RUN: not --crash llc -verify-machineinstrs=0 -regalloc=fast -O0 -mtriple=amdgcn-amd-amdhsa -debug-pass=Structure -o /dev/null %s 2>&1 | FileCheck -check-prefix=REGALLOC %s
1414

1515

1616
; REGALLOC: -regalloc not supported with amdgcn. Use -sgpr-regalloc, -wwm-regalloc, and -vgpr-regalloc

0 commit comments

Comments
 (0)