Skip to content

[OFFLOAD] Stricter enforcement of user offload disable #133470

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
jhuber6 merged 10 commits into from
Mar 28, 2025
Merged

[OFFLOAD] Stricter enforcement of user offload disable #133470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c073357
[OFFLOAD] Stricter enforcement of user offload disable
adurang Mar 28, 2025
df25852
Rework it without static var
adurang Mar 28, 2025
1eb05a1
Update offload/include/OffloadPolicy.h
adurang Mar 28, 2025
6baf698
remove comment
adurang Mar 28, 2025
9ff4b28
fix issue with refcount
adurang Mar 28, 2025
370c7d6
Move check to PluginManager::init
adurang Mar 28, 2025
c87236f
fix format
adurang Mar 28, 2025
0f330e9
format again
adurang Mar 28, 2025
acebf9c
move header
adurang Mar 28, 2025
4de69f2
order header..
adurang Mar 28, 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
22 changes: 20 additions & 2 deletions offload/include/OffloadPolicy.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ extern "C" int __kmpc_get_target_offload(void) __attribute__((weak));

class OffloadPolicy {

OffloadPolicy(PluginManager &PM) {
OffloadPolicy() {
// TODO: Check for OpenMP.
switch ((kmp_target_offload_kind_t)__kmpc_get_target_offload()) {
case tgt_disabled:
Expand All @@ -36,6 +36,17 @@ class OffloadPolicy {
Kind = MANDATORY;
return;
default:
// delay DEFAULT policy until PluginManager is ready
UserValue = false;
return;
};
}

OffloadPolicy(PluginManager &PM) {
const OffloadPolicy &OP = get();
if (!OP.UserValue) {
// User didn't specify a policy, decide
// based on number of devices discovered
if (PM.getNumDevices()) {
DP("Default TARGET OFFLOAD policy is now mandatory "
"(devices were found)\n");
Expand All @@ -46,10 +57,16 @@ class OffloadPolicy {
Kind = DISABLED;
}
return;
};
}
Kind = OP.Kind;
}

public:
static const OffloadPolicy &get() {
static OffloadPolicy OP;
return OP;
}

static const OffloadPolicy &get(PluginManager &PM) {
static OffloadPolicy OP(PM);
return OP;
Expand All @@ -58,6 +75,7 @@ class OffloadPolicy {
enum OffloadPolicyKind { DISABLED, MANDATORY };

OffloadPolicyKind Kind = MANDATORY;
bool UserValue = true;
};

#endif // OMPTARGET_OFFLOAD_POLICY_H
7 changes: 7 additions & 0 deletions offload/libomptarget/OffloadRTL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//

#include "OffloadPolicy.h"
#include "OpenMP/OMPT/Callback.h"
#include "PluginManager.h"

Expand All @@ -31,6 +32,12 @@ void initRuntime() {
if (PM == nullptr)
PM = new PluginManager();

if (OffloadPolicy::get().Kind == OffloadPolicy::DISABLED) {
DP("Offload is disabled. Skipping library initialization\n");
// Do only absolutely needed initialization
return;
}

RefCount++;
if (RefCount == 1) {
DP("Init offload library!\n");
Expand Down