[AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC #93501

SixWeining · 2024-05-28T03:49:34Z

hsa -> amdhsa
Use amdgcn-amd-amd{hsa,pal} for lower-work-group-id-intrinsics-{hsa,pal}.ll respectively

hsa -> amdhsa

llvmbot · 2024-05-28T03:50:04Z

@llvm/pr-subscribers-backend-amdgpu

Author: Lu Weining (SixWeining)

Changes

hsa -> amdhsa

Full diff: https://github.com/llvm/llvm-project/pull/93501.diff

2 Files Affected:

(modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll (+4-4)
(modified) llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll (+4-4)

diff --git a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
index 9547f08d3eba6..6b0a0ea5a2cfc 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9,GFX9-SDAG %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9,GFX9-GISEL %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH,GFX9ARCH-SDAG %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH,GFX9ARCH-GISEL %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9,GFX9-SDAG %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9,GFX9-GISEL %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH,GFX9ARCH-SDAG %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH,GFX9ARCH-GISEL %s
 ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-SDAG %s
 ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-GISEL %s
 
diff --git a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll
index 14fe4e5f48c67..f9408cfd05267 100644
--- a/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll
+++ b/llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll
@@ -1,8 +1,8 @@
 ; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-SDAG %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-GISEL %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-SDAG %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-GISEL %s
 ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-SDAG %s
 ; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-GISEL %s

SixWeining · 2024-05-28T07:59:00Z

Seem the tests did not pass... :(

arsenm

LGTM but the test will need update, this would have defaulted to unknown

SixWeining · 2024-05-28T12:49:46Z

LGTM but the test will need update, this would have defaulted to unknown

lower-work-group-id-intrinsics-hsa.ll is the case but lower-work-group-id-intrinsics-pal.ll is not.

If use -mtriple=amdgcn-amd-amdhsa, we got error:

error: <unknown>:0:0: in function _amdgpu_cs_main void (): unsupported non-compute shaders with HSA
                                               
error: <unknown>:0:0: in function caller void (): unsupported non-compute shaders with HSA

llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h:910: void llvm::SIMachineFunctionInfo::setScratchRSrcReg(llvm::Register): Assertion `Reg != 0 && "S
hould never be unset"' failed.

I suppose that lower-work-group-id-intrinsics-pal.ll only needs RUN lines with -mtriple=amdgcn-amd-amdpal while lower-work-group-id-intrinsics-hsa.ll only needs RUN lines with -mtriple=amdgcn-amd-amdhsa.

arsenm · 2024-05-28T12:55:51Z

llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-hsa.ll

-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH,GFX9ARCH-GISEL %s
-; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-SDAG %s
-; RUN: llc -mtriple=amdgcn-amd-amdpal -mcpu=gfx1200 -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX12,GFX12-GISEL %s
+; RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9,GFX9-SDAG %s


The tests should not be deleted. If the error is emitted, the test file should be split up

Seems that had been split into llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-{hsa,pal}.ll.

arsenm

Run lines probably still need to be updated, not removed. This is no longer stressing all the architected SGPR paths

arsenm · 2024-05-28T14:41:11Z

llvm/test/CodeGen/AMDGPU/lower-work-group-id-intrinsics-pal.ll

-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=-architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9 %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=0 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-SDAG %s
-; RUN: llc -mtriple=amdgcn-amd-hsa -mcpu=gfx900 -mattr=+architected-sgprs -global-isel=1 -verify-machineinstrs < %s | FileCheck -check-prefixes=GFX9ARCH-GISEL %s


These probably were intended to be amdgcn-amd-amdpal, there is lost coverage here now without flipping the architecture-sgprs feature

Yes, it should be. I have recovered them and changed to amdgcn-amd-amdpal. And same processing for lower-work-group-id-intrinsics-hsa.ll. Thanks.

…al}.ll respectively

…s-{hsa,pal}.ll. NFC (llvm#93501) - hsa -> amdhsa - Use amdgcn-amd-amd{hsa,pal} for lower-work-group-id-intrinsics-{hsa,pal}.ll respectively

[AMDGPU][test] Fix the wrong os names in triple. NFC

0948109

hsa -> amdhsa

SixWeining requested a review from jayfoad May 28, 2024 03:49

llvmbot added the backend:AMDGPU label May 28, 2024

arsenm reviewed May 28, 2024

View reviewed changes

remove incorrect tests

d0d68e6

arsenm reviewed May 28, 2024

View reviewed changes

Use amdgcn-amd-amd{hsa,pal} for lower-work-group-id-intrinsics-{hsa,p…

66aa315

…al}.ll respectively

SixWeining changed the title ~~[AMDGPU][test] Fix the wrong os names in triple. NFC~~ [AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC May 29, 2024

arsenm approved these changes May 29, 2024

View reviewed changes

SixWeining merged commit 5553f27 into llvm:main May 29, 2024
5 of 7 checks passed

SixWeining deleted the hsa_amdhsa branch May 29, 2024 09:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC #93501

[AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC #93501

Uh oh!

SixWeining commented May 28, 2024 •

edited

Loading

Uh oh!

llvmbot commented May 28, 2024

Uh oh!

SixWeining commented May 28, 2024

Uh oh!

arsenm left a comment

Uh oh!

SixWeining commented May 28, 2024

Uh oh!

arsenm May 28, 2024

Uh oh!

SixWeining May 28, 2024

Uh oh!

arsenm left a comment

Uh oh!

arsenm May 28, 2024

Uh oh!

SixWeining May 29, 2024

Uh oh!

Uh oh!

Uh oh!

[AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC #93501

[AMDGPU][test] Fix the wrong triples in lower-work-group-id-intrinsics-{hsa,pal}.ll. NFC #93501

Uh oh!

Conversation

SixWeining commented May 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented May 28, 2024

Uh oh!

SixWeining commented May 28, 2024

Uh oh!

arsenm left a comment

Choose a reason for hiding this comment

Uh oh!

SixWeining commented May 28, 2024

Uh oh!

arsenm May 28, 2024

Choose a reason for hiding this comment

Uh oh!

SixWeining May 28, 2024

Choose a reason for hiding this comment

Uh oh!

arsenm left a comment

Choose a reason for hiding this comment

Uh oh!

arsenm May 28, 2024

Choose a reason for hiding this comment

Uh oh!

SixWeining May 29, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

SixWeining commented May 28, 2024 •

edited

Loading