[Libomptarget][NFC] Remove trivially true checks on function pointers (#86804)
Summary:
Previously we had an interface that checked these functions pointers to
see if they are implemented by the plugin. This was removed as currently
every single function is implemented as a part of the common interface.
These checks are now always true and do nothing.
GitOrigin-RevId: 4a5056be2e38bdf27125a41f3f1b7ae4233f9713
diff --git a/libomptarget/src/device.cpp b/libomptarget/src/device.cpp
index 3345277..44a2fac 100644
--- a/libomptarget/src/device.cpp
+++ b/libomptarget/src/device.cpp
@@ -79,8 +79,7 @@
llvm::Error DeviceTy::init() {
// Make call to init_requires if it exists for this plugin.
int32_t Ret = 0;
- if (RTL->init_requires)
- Ret = RTL->init_requires(PM->getRequirements());
+ Ret = RTL->init_requires(PM->getRequirements());
if (Ret != OFFLOAD_SUCCESS)
return llvm::createStringError(
llvm::inconvertibleErrorCode(),
@@ -154,8 +153,6 @@
omp_get_initial_device(), HstPtrBegin, DeviceID, TgtPtrBegin, Size,
/*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
- if (!AsyncInfo || !RTL->data_submit_async || !RTL->synchronize)
- return RTL->data_submit(RTLDeviceID, TgtPtrBegin, HstPtrBegin, Size);
return RTL->data_submit_async(RTLDeviceID, TgtPtrBegin, HstPtrBegin, Size,
AsyncInfo);
}
@@ -176,8 +173,6 @@
DeviceID, TgtPtrBegin, omp_get_initial_device(), HstPtrBegin, Size,
/*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
- if (!RTL->data_retrieve_async || !RTL->synchronize)
- return RTL->data_retrieve(RTLDeviceID, HstPtrBegin, TgtPtrBegin, Size);
return RTL->data_retrieve_async(RTLDeviceID, HstPtrBegin, TgtPtrBegin, Size,
AsyncInfo);
}
@@ -196,7 +191,7 @@
RegionInterface.getCallbacks<ompt_target_data_transfer_from_device>(),
RTLDeviceID, SrcPtr, DstDev.RTLDeviceID, DstPtr, Size,
/*CodePtr=*/OMPT_GET_RETURN_ADDRESS);)
- if (!AsyncInfo || !RTL->data_exchange_async || !RTL->synchronize) {
+ if (!AsyncInfo) {
assert(RTL->data_exchange && "RTL->data_exchange is nullptr");
return RTL->data_exchange(RTLDeviceID, SrcPtr, DstDev.RTLDeviceID, DstPtr,
Size);
@@ -206,9 +201,6 @@
}
int32_t DeviceTy::notifyDataMapped(void *HstPtr, int64_t Size) {
- if (!RTL->data_notify_mapped)
- return OFFLOAD_SUCCESS;
-
DP("Notifying about new mapping: HstPtr=" DPxMOD ", Size=%" PRId64 "\n",
DPxPTR(HstPtr), Size);
@@ -220,9 +212,6 @@
}
int32_t DeviceTy::notifyDataUnmapped(void *HstPtr) {
- if (!RTL->data_notify_unmapped)
- return OFFLOAD_SUCCESS;
-
DP("Notifying about an unmapping: HstPtr=" DPxMOD "\n", DPxPTR(HstPtr));
if (RTL->data_notify_unmapped(RTLDeviceID, HstPtr)) {
@@ -242,70 +231,46 @@
// Run region on device
bool DeviceTy::printDeviceInfo() {
- if (!RTL->print_device_info)
- return false;
RTL->print_device_info(RTLDeviceID);
return true;
}
// Whether data can be copied to DstDevice directly
bool DeviceTy::isDataExchangable(const DeviceTy &DstDevice) {
- if (RTL != DstDevice.RTL || !RTL->is_data_exchangable)
+ if (RTL != DstDevice.RTL)
return false;
if (RTL->is_data_exchangable(RTLDeviceID, DstDevice.RTLDeviceID))
- return (RTL->data_exchange != nullptr) ||
- (RTL->data_exchange_async != nullptr);
-
+ return true;
return false;
}
int32_t DeviceTy::synchronize(AsyncInfoTy &AsyncInfo) {
- if (RTL->synchronize)
- return RTL->synchronize(RTLDeviceID, AsyncInfo);
- return OFFLOAD_SUCCESS;
+ return RTL->synchronize(RTLDeviceID, AsyncInfo);
}
int32_t DeviceTy::queryAsync(AsyncInfoTy &AsyncInfo) {
- if (RTL->query_async)
- return RTL->query_async(RTLDeviceID, AsyncInfo);
-
- return synchronize(AsyncInfo);
+ return RTL->query_async(RTLDeviceID, AsyncInfo);
}
int32_t DeviceTy::createEvent(void **Event) {
- if (RTL->create_event)
- return RTL->create_event(RTLDeviceID, Event);
-
- return OFFLOAD_SUCCESS;
+ return RTL->create_event(RTLDeviceID, Event);
}
int32_t DeviceTy::recordEvent(void *Event, AsyncInfoTy &AsyncInfo) {
- if (RTL->record_event)
- return RTL->record_event(RTLDeviceID, Event, AsyncInfo);
-
- return OFFLOAD_SUCCESS;
+ return RTL->record_event(RTLDeviceID, Event, AsyncInfo);
}
int32_t DeviceTy::waitEvent(void *Event, AsyncInfoTy &AsyncInfo) {
- if (RTL->wait_event)
- return RTL->wait_event(RTLDeviceID, Event, AsyncInfo);
-
- return OFFLOAD_SUCCESS;
+ return RTL->wait_event(RTLDeviceID, Event, AsyncInfo);
}
int32_t DeviceTy::syncEvent(void *Event) {
- if (RTL->sync_event)
- return RTL->sync_event(RTLDeviceID, Event);
-
- return OFFLOAD_SUCCESS;
+ return RTL->sync_event(RTLDeviceID, Event);
}
int32_t DeviceTy::destroyEvent(void *Event) {
- if (RTL->create_event)
- return RTL->destroy_event(RTLDeviceID, Event);
-
- return OFFLOAD_SUCCESS;
+ return RTL->destroy_event(RTLDeviceID, Event);
}
void DeviceTy::dumpOffloadEntries() {
@@ -321,7 +286,5 @@
}
bool DeviceTy::useAutoZeroCopy() {
- if (RTL->use_auto_zero_copy)
- return RTL->use_auto_zero_copy(RTLDeviceID);
- return false;
+ return RTL->use_auto_zero_copy(RTLDeviceID);
}
diff --git a/libomptarget/src/interface.cpp b/libomptarget/src/interface.cpp
index b7f547f..b562ba8 100644
--- a/libomptarget/src/interface.cpp
+++ b/libomptarget/src/interface.cpp
@@ -456,10 +456,8 @@
assert(PM && "Runtime not initialized");
std::atomic<uint32_t> &InfoLevel = getInfoLevelInternal();
InfoLevel.store(NewInfoLevel);
- for (auto &R : PM->pluginAdaptors()) {
- if (R.set_info_flag)
- R.set_info_flag(NewInfoLevel);
- }
+ for (auto &R : PM->pluginAdaptors())
+ R.set_info_flag(NewInfoLevel);
}
EXTERN int __tgt_print_device_info(int64_t DeviceId) {
diff --git a/libomptarget/src/omptarget.cpp b/libomptarget/src/omptarget.cpp
index 5bbf3a4..803e941 100644
--- a/libomptarget/src/omptarget.cpp
+++ b/libomptarget/src/omptarget.cpp
@@ -481,12 +481,10 @@
FATAL_MESSAGE(DeviceNum, "%s", toString(DeviceOrErr.takeError()).c_str());
int32_t Err = 0;
- if (!DeviceOrErr->RTL->data_lock) {
- Err = DeviceOrErr->RTL->data_lock(DeviceNum, HostPtr, Size, &RC);
- if (Err) {
- DP("Could not lock ptr %p\n", HostPtr);
- return nullptr;
- }
+ Err = DeviceOrErr->RTL->data_lock(DeviceNum, HostPtr, Size, &RC);
+ if (Err) {
+ DP("Could not lock ptr %p\n", HostPtr);
+ return nullptr;
}
DP("%s returns device ptr " DPxMOD "\n", Name, DPxPTR(RC));
return RC;
@@ -499,9 +497,7 @@
if (!DeviceOrErr)
FATAL_MESSAGE(DeviceNum, "%s", toString(DeviceOrErr.takeError()).c_str());
- if (!DeviceOrErr->RTL->data_unlock)
- DeviceOrErr->RTL->data_unlock(DeviceNum, HostPtr);
-
+ DeviceOrErr->RTL->data_unlock(DeviceNum, HostPtr);
DP("%s returns\n", Name);
}
