From e821f642fdc75922b1a020447485acccf3e7fa92 Mon Sep 17 00:00:00 2001 From: Kirill Stoimenov Date: Fri, 13 Dec 2024 23:36:45 +0000 Subject: [PATCH] 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 7a648554f886fbc043c4f3f58ca88f6c4535f2cf. --- llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp | 4 ++-- llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp index 88f7fe0a98d18f..7256eec89008a5 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp @@ -1560,7 +1560,7 @@ static const char RegAllocOptNotSupportedMessage[] = bool GCNPassConfig::addRegAssignAndRewriteFast() { if (!usingDefaultRegAlloc()) - report_fatal_error(RegAllocOptNotSupportedMessage, /*GenCrashDiag=*/false); + report_fatal_error(RegAllocOptNotSupportedMessage); addPass(&GCNPreRALongBranchRegID); @@ -1586,7 +1586,7 @@ bool GCNPassConfig::addRegAssignAndRewriteFast() { bool GCNPassConfig::addRegAssignAndRewriteOptimized() { if (!usingDefaultRegAlloc()) - report_fatal_error(RegAllocOptNotSupportedMessage, /*GenCrashDiag=*/false); + report_fatal_error(RegAllocOptNotSupportedMessage); addPass(&GCNPreRALongBranchRegID); diff --git a/llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll b/llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll index 33585024d81ddc..52ad7e5355207d 100644 --- a/llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll +++ b/llvm/test/CodeGen/AMDGPU/sgpr-regalloc-flags.ll @@ -9,8 +9,8 @@ ; 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 ; 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 -; 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 -; 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 +; 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 +; 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 ; REGALLOC: -regalloc not supported with amdgcn. Use -sgpr-regalloc, -wwm-regalloc, and -vgpr-regalloc