Author: Konstantin Zhuravlyov Date: 2020-10-13T12:20:28-04:00 New Revision: e2eaa914514c26c8e51c76148996a2e9cf74613c
URL: https://github.com/llvm/llvm-project/commit/e2eaa914514c26c8e51c76148996a2e9cf74613c DIFF: https://github.com/llvm/llvm-project/commit/e2eaa914514c26c8e51c76148996a2e9cf74613c.diff LOG: AMDGPU: Remove -mamdgpu-debugger-abi option It has been unsupported for few years now. Differential Revision: https://reviews.llvm.org/D89125 Added: Modified: clang/docs/ClangCommandLineReference.rst clang/include/clang/Driver/Options.td clang/lib/Driver/ToolChains/AMDGPU.cpp clang/test/Driver/amdgpu-features.c Removed: ################################################################################ diff --git a/clang/docs/ClangCommandLineReference.rst b/clang/docs/ClangCommandLineReference.rst index ff3decbca70c..97a96631cc21 100644 --- a/clang/docs/ClangCommandLineReference.rst +++ b/clang/docs/ClangCommandLineReference.rst @@ -2655,10 +2655,6 @@ Align selected branches (fused, jcc, jmp) within 32-byte boundary .. option:: -mcmodel=<arg>, -mcmodel=medany (equivalent to -mcmodel=medium), -mcmodel=medlow (equivalent to -mcmodel=small) -.. option:: -mcode-object-v3, -mno-code-object-v3 - -Enable code object v3 (AMDGPU only) - .. option:: -mconsole<arg> .. program:: clang1 @@ -2939,6 +2935,10 @@ Specify the size in bits of an SVE vector register. Defaults to the vector lengt AMDGPU ------ +.. option:: -mcode-object-v3, -mno-code-object-v3 + +Enable code object v3 (AMDGPU only) + .. option:: -mcumode, -mno-cumode CU wavefront execution mode is used (AMDGPU only) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 9980dda23bb0..f5e745b1dbe2 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -2461,12 +2461,6 @@ def mexec_model_EQ : Joined<["-"], "mexec-model=">, Group<m_wasm_Features_Driver Values<"command,reactor">, HelpText<"Execution model (WebAssembly only)">; -def mamdgpu_debugger_abi : Joined<["-"], "mamdgpu-debugger-abi=">, - Flags<[HelpHidden]>, - Group<m_Group>, - HelpText<"Generate additional code for specified <version> of debugger ABI (AMDGPU only)">, - MetaVarName<"<version>">; - def mcode_object_v3 : Flag<["-"], "mcode-object-v3">, Group<m_amdgpu_Features_Group>, HelpText<"Enable code object v3 (AMDGPU only)">; def mno_code_object_v3 : Flag<["-"], "mno-code-object-v3">, Group<m_amdgpu_Features_Group>, diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index 6781045886f2..5df7236f0223 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -365,9 +365,6 @@ void amdgpu::getAMDGPUTargetFeatures(const Driver &D, const llvm::Triple &Triple, const llvm::opt::ArgList &Args, std::vector<StringRef> &Features) { - if (const Arg *dAbi = Args.getLastArg(options::OPT_mamdgpu_debugger_abi)) - D.Diag(diag::err_drv_clang_unsupported) << dAbi->getAsString(Args); - // Add target ID features to -target-feature options. No diagnostics should // be emitted here since invalid target ID is diagnosed at other places. StringRef TargetID = Args.getLastArgValue(options::OPT_mcpu_EQ); diff --git a/clang/test/Driver/amdgpu-features.c b/clang/test/Driver/amdgpu-features.c index 71fd63715e00..17142ae23d6d 100644 --- a/clang/test/Driver/amdgpu-features.c +++ b/clang/test/Driver/amdgpu-features.c @@ -1,11 +1,3 @@ -// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=0.0 %s -o - 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-MAMDGPU-DEBUGGER-ABI-0-0 %s -// CHECK-MAMDGPU-DEBUGGER-ABI-0-0: the clang compiler does not support '-mamdgpu-debugger-abi=0.0' - -// RUN: %clang -### -target amdgcn -x cl -S -emit-llvm -mcpu=kaveri -mamdgpu-debugger-abi=1.0 %s -o - 2>&1 \ -// RUN: | FileCheck --check-prefix=CHECK-MAMDGPU-DEBUGGER-ABI-1-0 %s -// CHECK-MAMDGPU-DEBUGGER-ABI-1-0: the clang compiler does not support '-mamdgpu-debugger-abi=1.0' - // RUN: %clang -### -target amdgcn -mcpu=gfx700 -mcode-object-v3 %s 2>&1 | FileCheck --check-prefix=CODE-OBJECT-V3 %s // CODE-OBJECT-V3: "-target-feature" "+code-object-v3" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
