Revert "[Flang][Driver][AMDGPU] Fix -mcode-object-version (llvm#134230)"

breaks many smoke-fort, ovo, sollve tests

This reverts commit a17d496.

Author: ronlieb

clang/lib/Driver/ToolChains/Flang.cpp

@@ -427,9 +427,6 @@ void Flang::AddAMDGPUTargetArgs(const ArgList &Args,
   if (Arg *A = Args.getLastArg(options::OPT_mcode_object_version_EQ)) {
     StringRef Val = A->getValue();
     CmdArgs.push_back(Args.MakeArgString("-mcode-object-version=" + Val));
-    CmdArgs.push_back(Args.MakeArgString("-mllvm"));
-    CmdArgs.push_back(
-        Args.MakeArgString("--amdhsa-code-object-version=" + Val));
   }
 
   const ToolChain &TC = getToolChain();

flang/include/flang/Frontend/CodeGenOptions.h

@@ -95,7 +95,7 @@ class CodeGenOptions : public CodeGenOptionsBase {
 
   /// \brief Code object version for AMDGPU.
   llvm::CodeObjectVersionKind CodeObjectVersion =
-      llvm::CodeObjectVersionKind::COV_None;
+      llvm::CodeObjectVersionKind::COV_5;
 
   /// Optimization remark with an optional regular expression pattern.
   struct OptRemark {

flang/lib/Frontend/FrontendActions.cpp

@@ -863,17 +863,6 @@ void CodeGenAction::generateLLVMIR() {
     llvmModule->addModuleFlag(
         llvm::Module::Error, "target-abi",
         llvm::MDString::get(llvmModule->getContext(), targetOpts.abi));
-
-  if (triple.isAMDGPU() ||
-      (triple.isSPIRV() && triple.getVendor() == llvm::Triple::AMD)) {
-    // Emit amdhsa_code_object_version module flag, which is code object version
-    // times 100.
-    if (opts.CodeObjectVersion != llvm::CodeObjectVersionKind::COV_None) {
-      llvmModule->addModuleFlag(llvm::Module::Error,
-                                "amdhsa_code_object_version",
-                                opts.CodeObjectVersion);
-    }
-  }
 }
 
 static std::unique_ptr<llvm::raw_pwrite_stream>

flang/test/Driver/code-object-version.f90

@@ -5,12 +5,5 @@
 ! RUN: %flang  -target  x86_64-unknown-linux-gnu -mcode-object-version=3  -S  %s -o \
 ! RUN:   /dev/null 2>&1 | FileCheck  --check-prefix=UNUSED_PARAM %s
 
-! RUN: %flang -target amdgcn-amd-amdhsa -mcpu=gfx908 -mcode-object-version=5 -nogpulib -c %s -### 2>&1 \
-! RUN: | FileCheck %s -check-prefix=VALID_USE
-
 ! INVALID_VERSION: error: invalid integral value '3' in '-mcode-object-version=3'
 ! UNUSED_PARAM: warning: argument unused during compilation: '-mcode-object-version=3' [-Wunused-command-line-argument]
-
-! VALID_USE: "-fc1" "-triple" "amdgcn-amd-amdhsa"
-! VALID_USE-SAME: "-mcode-object-version=5"
-! VALID_USE-SAME: "-mllvm" "--amdhsa-code-object-version=5"