https://github.com/shiltian updated
https://github.com/llvm/llvm-project/pull/132814
>From c1f916c5cb19c1a816737dbb5cf21e5ac1636de3 Mon Sep 17 00:00:00 2001
From: Shilei Tian <i...@tianshilei.me>
Date: Mon, 24 Mar 2025 15:11:55 -0400
Subject: [PATCH 1/2] [AMDGPU] Remove outdated COV6 warning
---
clang/include/clang/Basic/DiagnosticDriverKinds.td | 4 ----
clang/lib/Driver/ToolChains/CommonArgs.cpp | 6 ------
clang/test/Driver/hip-code-object-version.hip | 5 -----
clang/test/Misc/warning-flags.c | 1 -
4 files changed, 16 deletions(-)
diff --git a/clang/include/clang/Basic/DiagnosticDriverKinds.td
b/clang/include/clang/Basic/DiagnosticDriverKinds.td
index 058fecd4e91ef..df24cca49aaae 100644
--- a/clang/include/clang/Basic/DiagnosticDriverKinds.td
+++ b/clang/include/clang/Basic/DiagnosticDriverKinds.td
@@ -92,10 +92,6 @@ def err_drv_hipspv_no_hip_path : Error<
"'--hip-path' must be specified when offloading to SPIR-V unless '-nogpuinc'
"
"is given">;
-// TODO: Remove when COV6 is fully supported by ROCm.
-def warn_drv_amdgpu_cov6: Warning<
- "code object v6 is still in development and not ready for production use
yet;"
- " use at your own risk">;
def err_drv_undetermined_gpu_arch : Error<
"cannot determine %0 architecture: %1; consider passing it via '%2'; "
"environment variable CLANG_TOOLCHAIN_PROGRAM_TIMEOUT specifies the tool "
diff --git a/clang/lib/Driver/ToolChains/CommonArgs.cpp
b/clang/lib/Driver/ToolChains/CommonArgs.cpp
index 157b9ff971add..7f04bcab9cd80 100644
--- a/clang/lib/Driver/ToolChains/CommonArgs.cpp
+++ b/clang/lib/Driver/ToolChains/CommonArgs.cpp
@@ -2748,12 +2748,6 @@ void tools::checkAMDGPUCodeObjectVersion(const Driver &D,
if (Remnant || CodeObjVer < MinCodeObjVer || CodeObjVer > MaxCodeObjVer)
D.Diag(diag::err_drv_invalid_int_value)
<< CodeObjArg->getAsString(Args) << CodeObjArg->getValue();
-
- // COV6 is only supported by LLVM at the time of writing this, and it's
- // expected to take some time before all ROCm components fully
- // support it. In the meantime, make sure users are aware of this.
- if (CodeObjVer == 6)
- D.Diag(diag::warn_drv_amdgpu_cov6);
}
}
}
diff --git a/clang/test/Driver/hip-code-object-version.hip
b/clang/test/Driver/hip-code-object-version.hip
index 30d8644dff54c..e6f5cc16fd408 100644
--- a/clang/test/Driver/hip-code-object-version.hip
+++ b/clang/test/Driver/hip-code-object-version.hip
@@ -27,11 +27,6 @@
// RUN: --offload-arch=gfx906 --rocm-path=%S/Inputs/rocm \
// RUN: %s 2>&1 | FileCheck -check-prefix=V6 %s
-// V6: warning: code object v6 is still in development and not ready for
production use yet; use at your own risk
-// V6: "-mcode-object-version=6"
-// V6: "-mllvm" "--amdhsa-code-object-version=6"
-// V6: "-targets=host-x86_64-unknown-linux-gnu,hipv4-amdgcn-amd-amdhsa--gfx906"
-
// Check bundle ID for code object version default
diff --git a/clang/test/Misc/warning-flags.c b/clang/test/Misc/warning-flags.c
index a978835a41014..2c2ac0513ac3e 100644
--- a/clang/test/Misc/warning-flags.c
+++ b/clang/test/Misc/warning-flags.c
@@ -40,7 +40,6 @@ CHECK-NEXT: warn_collection_expr_type
CHECK-NEXT: warn_conflicting_variadic
CHECK-NEXT: warn_delete_array_type
CHECK-NEXT: warn_double_const_requires_fp64
-CHECK-NEXT: warn_drv_amdgpu_cov6
CHECK-NEXT: warn_drv_assuming_mfloat_abi_is
CHECK-NEXT: warn_drv_clang_unsupported
CHECK-NEXT: warn_drv_pch_not_first_include
>From 4ed745c1c3fd5a81cd49a9e81d2bc92e86f3f6d8 Mon Sep 17 00:00:00 2001
From: Shilei Tian <i...@tianshilei.me>
Date: Mon, 24 Mar 2025 15:15:38 -0400
Subject: [PATCH 2/2] Fixed a test issue
---
clang/test/Driver/hip-code-object-version.hip | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/clang/test/Driver/hip-code-object-version.hip
b/clang/test/Driver/hip-code-object-version.hip
index e6f5cc16fd408..2c9d6fa435bb0 100644
--- a/clang/test/Driver/hip-code-object-version.hip
+++ b/clang/test/Driver/hip-code-object-version.hip
@@ -22,11 +22,14 @@
// Check bundle ID for code object version 6.
-// RUN: not %clang -### --target=x86_64-linux-gnu \
+// RUN: %clang -### --target=x86_64-linux-gnu \
// RUN: -mcode-object-version=6 \
// RUN: --offload-arch=gfx906 --rocm-path=%S/Inputs/rocm \
// RUN: %s 2>&1 | FileCheck -check-prefix=V6 %s
+// V6: "-mcode-object-version=6"
+// V6: "-mllvm" "--amdhsa-code-object-version=6"
+// V6: "-targets=host-x86_64-unknown-linux-gnu,hipv4-amdgcn-amd-amdhsa--gfx906"
// Check bundle ID for code object version default
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
