Skip to content

[OFFLOAD] Interop fixes for Windows #162652

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 1 commit into from
Oct 17, 2025
+7 −8
Merged

[OFFLOAD] Interop fixes for Windows #162652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions offload/include/OpenMP/InteropAPI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ typedef enum kmp_interop_type_t {
} kmp_interop_type_t;

struct interop_attrs_t {
bool inorder : 1;
int reserved : 31;
uint32_t inorder : 1;
uint32_t reserved : 31;

/// Check if the supported attributes are compatible with the current
/// attributes. Only if an attribute is supported can the value be true,
Expand All @@ -44,15 +44,15 @@ struct interop_spec_t {
};

struct interop_flags_t {
bool implicit : 1; // dispatch (true) or interop (false)
bool nowait : 1; // has nowait flag
int reserved : 30;
uint32_t implicit : 1; // dispatch (true) or interop (false)
uint32_t nowait : 1; // has nowait flag
uint32_t reserved : 30;
};

struct interop_ctx_t {
uint32_t version; // version of the interface (current is 0)
interop_flags_t flags;
int gtid;
int32_t gtid;
};

struct dep_pack_t {
Expand Down
3 changes: 1 addition & 2 deletions offload/libomptarget/OpenMP/InteropAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ extern "C" {

void __kmpc_omp_wait_deps(ident_t *loc_ref, int32_t gtid, int32_t ndeps,
kmp_depend_info_t *dep_list, int32_t ndeps_noalias,
kmp_depend_info_t *noalias_dep_list)
__attribute__((weak));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So it was marked as weak but didn't provide any definition in libomptarget (apart from the one in libomp)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems so. The ones in other places (like InternalTypes.h) also have "weak" but no definition. I have no idea who decided to do it like this but I think all "weak" attributes should probably removed.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so too. I don't see why these attributes are needed without a definition in libomptarget. If it's not linked to libomp, or another lib providing this symbol, there will be a linking error anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you prefer to do it on this PR or a sepparate one?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to know other opinions before, to confirm this is not necessary.

CC @jhuber6

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping? :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, so weak extern symbols are defined as nullptr and not a linker error in ELF. This might be trying to prevent that? I don't really know for sure what it's trying to do. There's no check on this function so if it wasn't defined this code would segfault. I'm just going to assume it's not needed, since we should always link liboimp w/ libomptarget` anyways.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the comment!

Maybe it's better to remove these weak attributes in a different PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I can do a follow-up for other functions specified as weak. Also, to gather them in one place, for some reason they're scattered here and there...

kmp_depend_info_t *noalias_dep_list);

} // extern "C"

Expand Down
Loading