This is an archive of the discontinued LLVM Phabricator instance.

Differential D145936

[AMDGPU] Fix .amdhsa_shared_vgpr_count error checking for GFX11
ClosedPublic

Authored by foad on Mar 13 2023, 7:07 AM.

Details

Reviewers
lamb-j
rampitec
kzhuravl
Group Reviewers
Restricted Project
Commits
rGdc3882eace54: [AMDGPU] Fix .amdhsa_shared_vgpr_count error checking for GFX11

Diff Detail

Unit TestsFailed

TimeTest
60,100 msx64 debian > MLIR.Examples/standalone::test.toy
60,070 msx64 debian > ThreadSanitizer-x86_64.ThreadSanitizer-x86_64::restore_stack.cpp

Event Timeline

foad created this revision.Mar 13 2023, 7:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2023, 7:07 AM
Herald added subscribers: kosarev, StephenFan, kerbowa and 6 others. · View Herald Transcript
foad requested review of this revision.Mar 13 2023, 7:07 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 13 2023, 7:07 AM
Herald added subscribers: llvm-commits, wdng. · View Herald Transcript
Harbormaster completed remote builds in B219031: Diff 504640.Mar 13 2023, 9:16 AM
rampitec accepted this revision.Mar 13 2023, 2:51 PM
This revision is now accepted and ready to land.Mar 13 2023, 2:51 PM
This revision was landed with ongoing or failed builds.Mar 14 2023, 2:05 AM
Closed by commit rGdc3882eace54: [AMDGPU] Fix .amdhsa_shared_vgpr_count error checking for GFX11 (authored by foad). · Explain Why
This revision was automatically updated to reflect the committed changes.
foad added a commit: rGdc3882eace54: [AMDGPU] Fix .amdhsa_shared_vgpr_count error checking for GFX11.

Revision Contents

PathSize
llvm/
lib/
Target/
AMDGPU/
AsmParser/
2 lines
test/
MC/
AMDGPU/
56 lines

Diff 504640

llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 5,309 Lines • ▼ Show 20 Lines if (AccumOffset < 4 || AccumOffset > 256 || (AccumOffset & 3))
return TokError("accum_offset should be in range [4..256] in " return TokError("accum_offset should be in range [4..256] in "
"increments of 4"); "increments of 4");
if (AccumOffset > alignTo(std::max((uint64_t)1, NextFreeVGPR), 4)) if (AccumOffset > alignTo(std::max((uint64_t)1, NextFreeVGPR), 4))
return TokError("accum_offset exceeds total VGPR allocation"); return TokError("accum_offset exceeds total VGPR allocation");
AMDHSA_BITS_SET(KD.compute_pgm_rsrc3, COMPUTE_PGM_RSRC3_GFX90A_ACCUM_OFFSET, AMDHSA_BITS_SET(KD.compute_pgm_rsrc3, COMPUTE_PGM_RSRC3_GFX90A_ACCUM_OFFSET,
(AccumOffset / 4 - 1)); (AccumOffset / 4 - 1));
} }
if (IVersion.Major == 10) { if (IVersion.Major >= 10) {
// SharedVGPRCount < 16 checked by PARSE_ENTRY_BITS // SharedVGPRCount < 16 checked by PARSE_ENTRY_BITS
if (SharedVGPRCount && EnableWavefrontSize32) { if (SharedVGPRCount && EnableWavefrontSize32) {
return TokError("shared_vgpr_count directive not valid on " return TokError("shared_vgpr_count directive not valid on "
"wavefront size 32"); "wavefront size 32");
} }
if (SharedVGPRCount * 2 + VGPRBlocks > 63) { if (SharedVGPRCount * 2 + VGPRBlocks > 63) {
return TokError("shared_vgpr_count*2 + " return TokError("shared_vgpr_count*2 + "
"compute_pgm_rsrc1.GRANULATED_WORKITEM_VGPR_COUNT cannot " "compute_pgm_rsrc1.GRANULATED_WORKITEM_VGPR_COUNT cannot "
▲ Show 20 Lines • Show All 3,953 Lines • Show Last 20 Lines

llvm/test/MC/AMDGPU/hsa-diag-v3.s

// RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx810 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX8,NONGFX10,AMDHSA // RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx810 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX8,PREGFX10,AMDHSA
// RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX10,AMDHSA // RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX10PLUS,GFX10,AMDHSA
// RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx1100 -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,GFX10PLUS,GFX11,AMDHSA
// RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd- -mcpu=gfx810 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,NONAMDHSA // RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd- -mcpu=gfx810 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GCN,NONAMDHSA
// RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx90a -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GFX90A,NONGFX10,AMDHSA,ALL // RUN: not llvm-mc --amdhsa-code-object-version=3 -triple amdgcn-amd-amdhsa -mcpu=gfx90a -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GFX90A,PREGFX10,AMDHSA,ALL
.text .text
// GCN-LABEL: warning: test_target // GCN-LABEL: warning: test_target
// GFX8-NOT: error: // GFX8-NOT: error:
// GFX10: error: .amdgcn_target directive's target id amdgcn-amd-amdhsa--gfx810+xnack does not match the specified target id amdgcn-amd-amdhsa--gfx1010+xnack // GFX10: error: .amdgcn_target directive's target id amdgcn-amd-amdhsa--gfx810+xnack does not match the specified target id amdgcn-amd-amdhsa--gfx1010+xnack
// GFX11: error: .amdgcn_target directive's target id amdgcn-amd-amdhsa--gfx810+xnack does not match the specified target id amdgcn-amd-amdhsa--gfx1100
// NONAMDHSA: error: .amdgcn_target directive's target id amdgcn-amd-amdhsa--gfx810+xnack does not match the specified target id amdgcn-amd-unknown--gfx810 // NONAMDHSA: error: .amdgcn_target directive's target id amdgcn-amd-amdhsa--gfx810+xnack does not match the specified target id amdgcn-amd-unknown--gfx810
.warning "test_target" .warning "test_target"
.amdgcn_target "amdgcn-amd-amdhsa--gfx810+xnack" .amdgcn_target "amdgcn-amd-amdhsa--gfx810+xnack"
// GCN-LABEL: warning: test_amdhsa_kernel_no_name // GCN-LABEL: warning: test_amdhsa_kernel_no_name
// GCN: error: unknown directive // GCN: error: unknown directive
.warning "test_amdhsa_kernel_no_name" .warning "test_amdhsa_kernel_no_name"
.amdhsa_kernel .amdhsa_kernel
▲ Show 20 Lines • Show All 130 Lines • ▼ Show 20 Lines
// GFX90A: error: value out of range // GFX90A: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_tg_split_invalid" .warning "test_amdhsa_tg_split_invalid"
.amdhsa_kernel test_amdhsa_tg_split_invalid .amdhsa_kernel test_amdhsa_tg_split_invalid
.amdhsa_tg_split 5 .amdhsa_tg_split 5
.end_amdhsa_kernel .end_amdhsa_kernel
// ALL-LABEL: warning: test_amdhsa_wavefront_size32 // ALL-LABEL: warning: test_amdhsa_wavefront_size32
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required // GFX10PLUS: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_wavefront_size32" .warning "test_amdhsa_wavefront_size32"
.amdhsa_kernel test_amdhsa_wavefront_size32 .amdhsa_kernel test_amdhsa_wavefront_size32
.amdhsa_wavefront_size32 1 .amdhsa_wavefront_size32 1
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_wavefront_size32_invalid // GCN-LABEL: warning: test_amdhsa_wavefront_size32_invalid
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10PLUS: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_wavefront_size32_invalid" .warning "test_amdhsa_wavefront_size32_invalid"
.amdhsa_kernel test_amdhsa_wavefront_size32_invalid .amdhsa_kernel test_amdhsa_wavefront_size32_invalid
.amdhsa_wavefront_size32 5 .amdhsa_wavefront_size32 5
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode // GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required // GFX10PLUS: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_workgroup_processor_mode" .warning "test_amdhsa_workgroup_processor_mode"
.amdhsa_kernel test_amdhsa_workgroup_processor_mode .amdhsa_kernel test_amdhsa_workgroup_processor_mode
.amdhsa_workgroup_processor_mode 1 .amdhsa_workgroup_processor_mode 1
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode_invalid // GCN-LABEL: warning: test_amdhsa_workgroup_processor_mode_invalid
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10PLUS: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_workgroup_processor_mode_invalid" .warning "test_amdhsa_workgroup_processor_mode_invalid"
.amdhsa_kernel test_amdhsa_workgroup_processor_mode_invalid .amdhsa_kernel test_amdhsa_workgroup_processor_mode_invalid
.amdhsa_workgroup_processor_mode 5 .amdhsa_workgroup_processor_mode 5
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_memory_ordered // GCN-LABEL: warning: test_amdhsa_memory_ordered
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required // GFX10PLUS: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_memory_ordered" .warning "test_amdhsa_memory_ordered"
.amdhsa_kernel test_amdhsa_memory_ordered .amdhsa_kernel test_amdhsa_memory_ordered
.amdhsa_memory_ordered 1 .amdhsa_memory_ordered 1
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_memory_ordered_invalid // GCN-LABEL: warning: test_amdhsa_memory_ordered_invalid
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10PLUS: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_memory_ordered_invalid" .warning "test_amdhsa_memory_ordered_invalid"
.amdhsa_kernel test_amdhsa_memory_ordered_invalid .amdhsa_kernel test_amdhsa_memory_ordered_invalid
.amdhsa_memory_ordered 5 .amdhsa_memory_ordered 5
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_forward_progress // GCN-LABEL: warning: test_amdhsa_forward_progress
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required // GFX10PLUS: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_forward_progress" .warning "test_amdhsa_forward_progress"
.amdhsa_kernel test_amdhsa_forward_progress .amdhsa_kernel test_amdhsa_forward_progress
.amdhsa_forward_progress 1 .amdhsa_forward_progress 1
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_forward_progress_invalid // GCN-LABEL: warning: test_amdhsa_forward_progress_invalid
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10PLUS: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_forward_progress_invalid" .warning "test_amdhsa_forward_progress_invalid"
.amdhsa_kernel test_amdhsa_forward_progress_invalid .amdhsa_kernel test_amdhsa_forward_progress_invalid
.amdhsa_forward_progress 5 .amdhsa_forward_progress 5
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid1 // GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid1
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required // GFX10PLUS: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_shared_vgpr_count_invalid1" .warning "test_amdhsa_shared_vgpr_count_invalid1"
.amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid1 .amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid1
.amdhsa_shared_vgpr_count 8 .amdhsa_shared_vgpr_count 8
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid2 // GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid2
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: shared_vgpr_count directive not valid on wavefront size 32 // GFX10PLUS: error: shared_vgpr_count directive not valid on wavefront size 32
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_shared_vgpr_count_invalid2" .warning "test_amdhsa_shared_vgpr_count_invalid2"
.amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid2 .amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid2
.amdhsa_next_free_vgpr 16 .amdhsa_next_free_vgpr 16
.amdhsa_next_free_sgpr 0 .amdhsa_next_free_sgpr 0
.amdhsa_shared_vgpr_count 8 .amdhsa_shared_vgpr_count 8
.amdhsa_wavefront_size32 1 .amdhsa_wavefront_size32 1
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid3 // GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid3
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10PLUS: error: value out of range
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_shared_vgpr_count_invalid3" .warning "test_amdhsa_shared_vgpr_count_invalid3"
.amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid3 .amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid3
.amdhsa_next_free_vgpr 32 .amdhsa_next_free_vgpr 32
.amdhsa_next_free_sgpr 0 .amdhsa_next_free_sgpr 0
.amdhsa_shared_vgpr_count 16 .amdhsa_shared_vgpr_count 16
.end_amdhsa_kernel .end_amdhsa_kernel
// GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid4 // GCN-LABEL: warning: test_amdhsa_shared_vgpr_count_invalid4
// NONGFX10: error: directive requires gfx10+ // PREGFX10: error: directive requires gfx10+
// GFX10: error: shared_vgpr_count*2 + compute_pgm_rsrc1.GRANULATED_WORKITEM_VGPR_COUNT cannot exceed 63 // GFX10PLUS: error: shared_vgpr_count*2 + compute_pgm_rsrc1.GRANULATED_WORKITEM_VGPR_COUNT cannot exceed 63
// NONAMDHSA: error: unknown directive // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_shared_vgpr_count_invalid4" .warning "test_amdhsa_shared_vgpr_count_invalid4"
.amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid4 .amdhsa_kernel test_amdhsa_shared_vgpr_count_invalid4
.amdhsa_next_free_vgpr 273 .amdhsa_next_free_vgpr 273
.amdhsa_next_free_sgpr 0 .amdhsa_next_free_sgpr 0
.amdhsa_shared_vgpr_count 15 .amdhsa_shared_vgpr_count 15
.end_amdhsa_kernel .end_amdhsa_kernel
Show All 9 Lines