Skip to content

[Flang][Driver][AMDGPU] Fix -mcode-object-version #134230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2025
Merged

[Flang][Driver][AMDGPU] Fix -mcode-object-version #134230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3bf58
[Flang][OpenMP][Driver][AMDGPU] Fix -mcode-object-version
skatrak Apr 2, 2025
bd604cb
Merge branch 'main' into fix-mcode-object-version
skatrak Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions clang/lib/Driver/ToolChains/Flang.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,9 @@ 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();
Expand Down
2 changes: 1 addition & 1 deletion flang/include/flang/Frontend/CodeGenOptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class CodeGenOptions : public CodeGenOptionsBase {

/// \brief Code object version for AMDGPU.
llvm::CodeObjectVersionKind CodeObjectVersion =
llvm::CodeObjectVersionKind::COV_5;
llvm::CodeObjectVersionKind::COV_None;

/// Optimization remark with an optional regular expression pattern.
struct OptRemark {
Expand Down
11 changes: 11 additions & 0 deletions flang/lib/Frontend/FrontendActions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,17 @@ 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>
Expand Down
7 changes: 7 additions & 0 deletions flang/test/Driver/code-object-version.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,12 @@
! 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"
22 changes: 22 additions & 0 deletions flang/test/Integration/amdgpu-code-object-version.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
!REQUIRES: amdgpu-registered-target

!RUN: %flang_fc1 -emit-llvm -triple amdgcn-amd-amdhsa -target-cpu gfx908 %s -o - | FileCheck --check-prefix=COV-DEFAULT %s
!RUN: %flang_fc1 -emit-llvm -triple amdgcn-amd-amdhsa -target-cpu gfx908 -mcode-object-version=none %s -o - | FileCheck --check-prefix=COV-NONE %s
!RUN: %flang_fc1 -emit-llvm -triple amdgcn-amd-amdhsa -target-cpu gfx908 -mcode-object-version=4 %s -o - | FileCheck --check-prefix=COV-4 %s
!RUN: %flang_fc1 -emit-llvm -triple amdgcn-amd-amdhsa -target-cpu gfx908 -mcode-object-version=5 %s -o - | FileCheck --check-prefix=COV-5 %s
!RUN: %flang_fc1 -emit-llvm -triple amdgcn-amd-amdhsa -target-cpu gfx908 -mcode-object-version=6 %s -o - | FileCheck --check-prefix=COV-6 %s

!COV-DEFAULT-NOT: !{{.*}} = !{{{.*}}, !"amdhsa_code_object_version", {{.*}}}
!COV-NONE-NOT: !{{.*}} = !{{{.*}}, !"amdhsa_code_object_version", {{.*}}}

!COV-4: !llvm.module.flags = !{{{.*}}, ![[COV_FLAG:.*]]}
!COV-4: ![[COV_FLAG]] = !{i32 1, !"amdhsa_code_object_version", i32 400}

!COV-5: !llvm.module.flags = !{{{.*}}, ![[COV_FLAG:.*]]}
!COV-5: ![[COV_FLAG]] = !{i32 1, !"amdhsa_code_object_version", i32 500}

!COV-6: !llvm.module.flags = !{{{.*}}, ![[COV_FLAG:.*]]}
!COV-6: ![[COV_FLAG]] = !{i32 1, !"amdhsa_code_object_version", i32 600}

subroutine target_simple
end subroutine