This is an archive of the discontinued LLVM Phabricator instance.

Differential D89635

[AMDGPU] Correct hsa-diag-v3.s test
ClosedPublic

Authored by t-tye on Oct 17 2020, 3:10 PM.

Details

Reviewers
kzhuravl
scott.linder
rampitec
Commits
rGceb9940b39ca: [AMDGPU] Correct hsa-diag-v3.s test
Summary
  • Use file_check -LABEL markers to prevent false positives being reported due to messages from different tests causing success to be reported.
  • Add checks for all the run commands for more robust testing.
  • Add checks for the absence of errors.
  • Name and order tests more sensibly.

Diff Detail

Event Timeline

t-tye created this revision.Oct 17 2020, 3:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 17 2020, 3:10 PM
Herald added subscribers: llvm-commits, kerbowa, tpr and 4 others. · View Herald Transcript
t-tye requested review of this revision.Oct 17 2020, 3:10 PM
Herald added a subscriber: wdng. · View Herald TranscriptOct 17 2020, 3:10 PM
Harbormaster completed remote builds in B75438: Diff 298853.Oct 17 2020, 3:47 PM
t-tye updated this revision to Diff 298917.Oct 18 2020, 7:22 PM

Use FileCheck --check-prefixes

t-tye updated this revision to Diff 298918.Oct 18 2020, 7:33 PM

Correct whitespace.

Harbormaster completed remote builds in B75479: Diff 298917.Oct 18 2020, 8:00 PM
Harbormaster completed remote builds in B75480: Diff 298918.Oct 18 2020, 8:05 PM
t-tye updated this revision to Diff 298930.Oct 18 2020, 10:27 PM

Generalize label names.

Harbormaster completed remote builds in B75488: Diff 298930.Oct 18 2020, 11:00 PM
scott.linder accepted this revision.Oct 19 2020, 8:12 AM

LGTM, thank you!

This revision is now accepted and ready to land.Oct 19 2020, 8:12 AM
This revision was landed with ongoing or failed builds.Oct 19 2020, 10:09 AM
Closed by commit rGceb9940b39ca: [AMDGPU] Correct hsa-diag-v3.s test (authored by t-tye). · Explain Why
This revision was automatically updated to reflect the committed changes.
t-tye added a commit: rGceb9940b39ca: [AMDGPU] Correct hsa-diag-v3.s test.

Revision Contents

PathSize
llvm/
test/
MC/
AMDGPU/
161 lines

Diff 299087

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

// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s // RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=GFX8,NONGFX90A,NONGFX10,AMDHSA,ALL
// RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefix=GFX10 // RUN: not llvm-mc -triple amdgcn-amd-amdhsa -mcpu=gfx1010 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=NONGFX8,NONGFX90A,GFX10,AMDHSA,ALL
// RUN: not llvm-mc -triple amdgcn-amd- -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefix=NOT-AMDHSA // RUN: not llvm-mc -triple amdgcn-amd- -mcpu=gfx803 -mattr=+xnack -show-encoding %s 2>&1 >/dev/null | FileCheck %s --check-prefixes=NONAMDHSA,ALL
.text .text
.amdgcn_target "amdgcn--amdhsa-gfx803+xnack" // ALL-LABEL: warning: test_target
// CHECK: error: target must match options // GFX8-NOT: error:
// GFX10: error: target must match options
// NONAMDHSA: error: unknown directive
.warning "test_target"
.amdgcn_target "amdgcn-amd-amdhsa--gfx803+xnack"
// ALL-LABEL: warning: test_amdhsa_kernel_no_name
// ALL: error: unknown directive
.warning "test_amdhsa_kernel_no_name"
.amdhsa_kernel .amdhsa_kernel
// CHECK: error: unknown directive
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_kernel_empty
.amdhsa_group_segment_fixed_size -1 // AMDHSA-NOT: error: unknown directive
// CHECK: error: value out of range // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_kernel_empty"
.amdhsa_kernel test_amdhsa_kernel_empty
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_kernel_unknown_directive
.amdhsa_group_segment_fixed_size 10000000000 + 1 // AMDHSA: error: expected .amdhsa_ directive or .end_amdhsa_kernel
// CHECK: error: value out of range // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_kernel_unknown_directive"
.amdhsa_kernel test_amdhsa_kernel_unknown_directive
1
.end_amdhsa_kernel
// ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_size
// AMDHSA: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_invalid_size"
.amdhsa_kernel test_amdhsa_group_segment_fixed_size_invalid_size
.amdhsa_group_segment_fixed_size -1
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_invalid_expression
// NOT-AMDHSA: error: unknown directive // AMDHSA: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_invalid_expression"
.amdhsa_kernel test_amdhsa_group_segment_fixed_size_invalid_expression
.amdhsa_group_segment_fixed_size 10000000000 + 1
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_group_segment_fixed_size_repeated
// AMDHSA: error: .amdhsa_ directives cannot be repeated
// NONAMDHSA-: error: unknown directive
.warning "test_amdhsa_group_segment_fixed_size_repeated"
.amdhsa_kernel test_amdhsa_group_segment_fixed_size_repeated
.amdhsa_group_segment_fixed_size 1 .amdhsa_group_segment_fixed_size 1
.amdhsa_group_segment_fixed_size 1 .amdhsa_group_segment_fixed_size 1
// CHECK: error: .amdhsa_ directives cannot be repeated
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_next_free_vgpr_missing
// CHECK: error: .amdhsa_next_free_vgpr directive is required // AMDHSA: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_next_free_vgpr_missing"
.amdhsa_kernel test_amdhsa_next_free_vgpr_missing
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_next_free_sgpr_missing
// AMDHSA: error: .amdhsa_next_free_sgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_next_free_sgpr_missing"
.amdhsa_kernel test_amdhsa_next_free_sgpr_missing
.amdhsa_next_free_vgpr 0 .amdhsa_next_free_vgpr 0
// CHECK: error: .amdhsa_next_free_sgpr directive is required
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_wavefront_size32
1 // NONGFX10: error: directive requires gfx10+
// CHECK: error: expected .amdhsa_ directive or .end_amdhsa_kernel // GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_wavefront_size32"
.amdhsa_kernel test_amdhsa_wavefront_size32
.amdhsa_wavefront_size32 1
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_wavefront_size32_invalid
.amdhsa_wavefront_size32 1 // NONGFX10: error: directive requires gfx10+
// CHECK: error: directive requires gfx10+ // GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_wavefront_size32_invalid"
.amdhsa_kernel test_amdhsa_wavefront_size32_invalid
.amdhsa_wavefront_size32 5
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_workgroup_processor_mode
// NONGFX10: error: directive requires gfx10+
// GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_workgroup_processor_mode"
.amdhsa_kernel test_amdhsa_workgroup_processor_mode
.amdhsa_workgroup_processor_mode 1 .amdhsa_workgroup_processor_mode 1
// CHECK: error: directive requires gfx10+
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_workgroup_processor_mode_invalid
.amdhsa_memory_ordered 1 // NONGFX10: error: directive requires gfx10+
// CHECK: error: directive requires gfx10+ // GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_workgroup_processor_mode_invalid"
.amdhsa_kernel test_amdhsa_workgroup_processor_mode_invalid
.amdhsa_workgroup_processor_mode 5
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_memory_ordered
.amdhsa_forward_progress 1 // NONGFX10: error: directive requires gfx10+
// CHECK: error: directive requires gfx10+ // GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_memory_ordered"
.amdhsa_kernel test_amdhsa_memory_ordered
.amdhsa_memory_ordered 1
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_memory_ordered_invalid
.amdhsa_wavefront_size32 5 // NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10: error: value out of range
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_memory_ordered_invalid"
.amdhsa_kernel test_amdhsa_memory_ordered_invalid
.amdhsa_memory_ordered 5
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_forward_progress
.amdhsa_workgroup_processor_mode 5 // NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10: error: .amdhsa_next_free_vgpr directive is required
// NONAMDHSA: error: unknown directive
.warning "test_amdhsa_forward_progress"
.amdhsa_kernel test_amdhsa_forward_progress
.amdhsa_forward_progress 1
.end_amdhsa_kernel .end_amdhsa_kernel
.amdhsa_kernel foo // ALL-LABEL: warning: test_amdhsa_forward_progress_invalid
.amdhsa_memory_ordered 5 // NONGFX10: error: directive requires gfx10+
// GFX10: error: value out of range // GFX10: error: value out of range
.end_amdhsa_kernel // NONAMDHSA: error: unknown directive
.warning "test_amdhsa_forward_progress_invalid"
.amdhsa_kernel foo .amdhsa_kernel test_amdhsa_forward_progress_invalid
.amdhsa_forward_progress 5 .amdhsa_forward_progress 5
// GFX10: error: value out of range
.end_amdhsa_kernel .end_amdhsa_kernel
// ALL-LABEL: warning: test_next_free_vgpr_invalid
// AMDHSA: error: .amdgcn.next_free_{v,s}gpr symbols must be absolute expressions
// NONAMDHSA-NOT: error:
.warning "test_next_free_vgpr_invalid"
.set .amdgcn.next_free_vgpr, "foo" .set .amdgcn.next_free_vgpr, "foo"
v_mov_b32_e32 v0, s0 v_mov_b32_e32 v0, s0
// CHECK: error: .amdgcn.next_free_{v,s}gpr symbols must be absolute expressions
// ALL-LABEL: warning: test_end
.warning "test_end"