llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang @llvm/pr-subscribers-backend-amdgpu Author: Stanislav Mekhanoshin (rampitec) <details> <summary>Changes</summary> --- Full diff: https://github.com/llvm/llvm-project/pull/97633.diff 5 Files Affected: - (modified) clang/lib/Basic/Targets/AMDGPU.cpp (+6-2) - (modified) clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl (+2) - (modified) clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl (+1-2) - (modified) llvm/include/llvm/TargetParser/TargetParser.h (+2-1) - (modified) llvm/lib/TargetParser/TargetParser.cpp (+9-4) ``````````diff diff --git a/clang/lib/Basic/Targets/AMDGPU.cpp b/clang/lib/Basic/Targets/AMDGPU.cpp index cc7be64656e5b..ea20acdb930fa 100644 --- a/clang/lib/Basic/Targets/AMDGPU.cpp +++ b/clang/lib/Basic/Targets/AMDGPU.cpp @@ -188,8 +188,12 @@ bool AMDGPUTargetInfo::initFeatureMap( // TODO: Should move this logic into TargetParser std::string ErrorMsg; - if (!insertWaveSizeFeature(CPU, getTriple(), Features, ErrorMsg)) { - Diags.Report(diag::err_invalid_feature_combination) << ErrorMsg; + bool IsCombinationError; + if (!insertWaveSizeFeature(CPU, getTriple(), Features, ErrorMsg, + IsCombinationError)) { + Diags.Report(IsCombinationError ? diag::err_invalid_feature_combination + : diag::err_opt_not_valid_on_target) + << ErrorMsg; return false; } diff --git a/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl b/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl index 7dbf5c3c6cd59..4e2f7f86e8402 100644 --- a/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl +++ b/clang/test/CodeGenOpenCL/amdgpu-features-illegal.cl @@ -1,6 +1,8 @@ // RUN: not %clang_cc1 -triple amdgcn -target-feature +wavefrontsize32 -target-feature +wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck %s // RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx1103 -target-feature +wavefrontsize32 -target-feature +wavefrontsize64 -o /dev/null %s 2>&1 | FileCheck %s +// RUN: not %clang_cc1 -triple amdgcn -target-cpu gfx900 -target-feature +wavefrontsize32 -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=GFX9 // CHECK: error: invalid feature combination: 'wavefrontsize32' and 'wavefrontsize64' are mutually exclusive +// GFX9: error: option 'wavefrontsize32' cannot be specified on this target kernel void test() {} diff --git a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl index 52f31c1ff0575..e0e3872b566d9 100644 --- a/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl +++ b/clang/test/SemaOpenCL/builtins-amdgcn-error-wave32.cl @@ -12,8 +12,7 @@ void test_ballot_wave32(global uint* out, int a, int b) { *out = __builtin_amdgcn_ballot_w32(a == b); // expected-error {{'__builtin_amdgcn_ballot_w32' needs target feature wavefrontsize32}} } -// FIXME: Should error for subtargets that don't support wave32 -__attribute__((target("wavefrontsize32"))) +__attribute__((target("wavefrontsize32"))) // gfx9-error@*:* {{option 'wavefrontsize32' cannot be specified on this target}} void test_ballot_wave32_target_attr(global uint* out, int a, int b) { *out = __builtin_amdgcn_ballot_w32(a == b); } diff --git a/llvm/include/llvm/TargetParser/TargetParser.h b/llvm/include/llvm/TargetParser/TargetParser.h index e03d8f6eebfca..858a1fdc01b37 100644 --- a/llvm/include/llvm/TargetParser/TargetParser.h +++ b/llvm/include/llvm/TargetParser/TargetParser.h @@ -178,7 +178,8 @@ void fillAMDGPUFeatureMap(StringRef GPU, const Triple &T, /// Inserts wave size feature for given GPU into features map bool insertWaveSizeFeature(StringRef GPU, const Triple &T, - StringMap<bool> &Features, std::string &ErrorMsg); + StringMap<bool> &Features, std::string &ErrorMsg, + bool &IsCombinationError); } // namespace AMDGPU } // namespace llvm diff --git a/llvm/lib/TargetParser/TargetParser.cpp b/llvm/lib/TargetParser/TargetParser.cpp index 00df92e0aaded..4bcd966183c67 100644 --- a/llvm/lib/TargetParser/TargetParser.cpp +++ b/llvm/lib/TargetParser/TargetParser.cpp @@ -618,15 +618,20 @@ static bool isWave32Capable(StringRef GPU, const Triple &T) { bool AMDGPU::insertWaveSizeFeature(StringRef GPU, const Triple &T, StringMap<bool> &Features, - std::string &ErrorMsg) { + std::string &ErrorMsg, + bool &IsCombinationError) { bool IsWave32Capable = isWave32Capable(GPU, T); const bool IsNullGPU = GPU.empty(); - // FIXME: Not diagnosing wavefrontsize32 on wave64 only targets. - const bool HaveWave32 = - (IsWave32Capable || IsNullGPU) && Features.count("wavefrontsize32"); + const bool HaveWave32 = Features.count("wavefrontsize32"); const bool HaveWave64 = Features.count("wavefrontsize64"); if (HaveWave32 && HaveWave64) { ErrorMsg = "'wavefrontsize32' and 'wavefrontsize64' are mutually exclusive"; + IsCombinationError = true; + return false; + } + if (HaveWave32 && !IsNullGPU && !IsWave32Capable) { + ErrorMsg = "wavefrontsize32"; + IsCombinationError = false; return false; } // Don't assume any wavesize with an unknown subtarget. `````````` </details> https://github.com/llvm/llvm-project/pull/97633 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
