Skip to content

[flang] Inherit target specific code for BIND(C) types on Windows #129579

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

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[flang] Inherit target specific code for BIND(C) types on Windows #129579

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
0277f08
[flang] Inherit target specific code for BIND(C) types on Windows
mmuetzel Mar 3, 2025
9ed20d3
[flang] Add struct passing for BIND(C) values for Windows x86_64
jeanPerier Mar 6, 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
51 changes: 43 additions & 8 deletions flang/lib/Optimizer/CodeGen/Target.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,8 @@ struct TargetI386 : public GenericTarget<TargetI386> {
//===----------------------------------------------------------------------===//

namespace {
struct TargetI386Win : public GenericTarget<TargetI386Win> {
using GenericTarget::GenericTarget;

static constexpr int defaultWidth = 32;
struct TargetI386Win : public TargetI386 {
using TargetI386::TargetI386;

CodeGenSpecifics::Marshalling
complexArgumentType(mlir::Location loc, mlir::Type eleTy) const override {
Expand Down Expand Up @@ -718,10 +716,8 @@ struct TargetX86_64 : public GenericTarget<TargetX86_64> {
//===----------------------------------------------------------------------===//

namespace {
struct TargetX86_64Win : public GenericTarget<TargetX86_64Win> {
using GenericTarget::GenericTarget;

static constexpr int defaultWidth = 64;
struct TargetX86_64Win : public TargetX86_64 {
using TargetX86_64::TargetX86_64;

CodeGenSpecifics::Marshalling
complexArgumentType(mlir::Location loc, mlir::Type eleTy) const override {
Expand Down Expand Up @@ -780,6 +776,45 @@ struct TargetX86_64Win : public GenericTarget<TargetX86_64Win> {
}
return marshal;
}

CodeGenSpecifics::Marshalling
structArgumentType(mlir::Location loc, fir::RecordType type,
const Marshalling &) const override {
std::uint64_t size =
fir::getTypeSizeAndAlignmentOrCrash(loc, type, getDataLayout(), kindMap)
.first;
CodeGenSpecifics::Marshalling marshal;
if (size <= 8)
marshal.emplace_back(mlir::IntegerType::get(type.getContext(), size * 8),
AT{});
else
// TODO: investigate: clang is not setting the byval attribute, it is not
// clear why. Currently, this needs to be set here for flang so that the
// target-rewrite pass allocate memory as expected. Is it OK to set byval
// when clang does not?
marshal.emplace_back(fir::ReferenceType::get(type),
AT{16, /*byval=*/true, /*sret=*/false});
return marshal;
}

CodeGenSpecifics::Marshalling
structReturnType(mlir::Location loc, fir::RecordType type) const override {
std::uint64_t size =
fir::getTypeSizeAndAlignmentOrCrash(loc, type, getDataLayout(), kindMap)
.first;
CodeGenSpecifics::Marshalling marshal;
if (size <= 8)
marshal.emplace_back(mlir::IntegerType::get(type.getContext(), size * 8),
AT{});
else
// TODO: investigate: the ABI is not very clear about the alignment for
// the return in memory (while it was explicit about 16 for the argument
// passing case). Should it be the default alignment for that type
// instead?
marshal.emplace_back(fir::ReferenceType::get(type),
AT{16, /*byval=*/false, /*sret=*/true});
return marshal;
}
};
} // namespace

Expand Down
1 change: 1 addition & 0 deletions flang/test/Fir/struct-passing-x86-64-several-fields-inreg.fir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// struct has more than one field.
// REQUIRES: x86-registered-target
// RUN: fir-opt -target-rewrite="target=x86_64-unknown-linux-gnu" %s -o - | FileCheck %s
// RUN: fir-opt -target-rewrite="target=x86_64-w64-windows-gnu" %s -o - | FileCheck %s


module attributes {fir.defaultkind = "a1c4d8i4l4r4", fir.kindmap = "", llvm.data_layout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", llvm.target_triple = "x86_64-unknown-linux-gnu"} {
Expand Down
1 change: 1 addition & 0 deletions flang/test/Fir/target-rewrite-boxchar.fir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// RUN: fir-opt --target-rewrite="target=i386-unknown-linux-gnu" %s | FileCheck %s --check-prefix=INT32
// RUN: fir-opt --target-rewrite="target=x86_64-unknown-linux-gnu" %s | FileCheck %s --check-prefix=INT64
// RUN: fir-opt --target-rewrite="target=x86_64-w64-windows-gnu" %s | FileCheck %s --check-prefix=INT64
// RUN: fir-opt --target-rewrite="target=aarch64-unknown-linux-gnu" %s | FileCheck %s --check-prefix=INT64
// RUN: fir-opt --target-rewrite="target=powerpc64le-unknown-linux-gnu" %s | FileCheck %s --check-prefix=INT64
// RUN: fir-opt --target-rewrite="target=amdgcn-amd-amdhsa" %s | FileCheck %s --check-prefix=INT64
Expand Down
Loading