https://github.com/adurang updated
https://github.com/llvm/llvm-project/pull/160570
>From c15a1f18dad2a4ea880bf785f942d9a84be8364f Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 19:16:41 +0200
Subject: [PATCH 01/10] [clang][tools] Add LevelZero support to offload-arch
---
clang/tools/offload-arch/CMakeLists.txt | 10 +-
clang/tools/offload-arch/LevelZeroArch.cpp | 133 +++++++++++++++++++++
clang/tools/offload-arch/OffloadArch.cpp | 19 ++-
3 files changed, 157 insertions(+), 5 deletions(-)
create mode 100644 clang/tools/offload-arch/LevelZeroArch.cpp
diff --git a/clang/tools/offload-arch/CMakeLists.txt
b/clang/tools/offload-arch/CMakeLists.txt
index cb50b9c1d6dde..187c4d9517551 100644
--- a/clang/tools/offload-arch/CMakeLists.txt
+++ b/clang/tools/offload-arch/CMakeLists.txt
@@ -1,8 +1,16 @@
set(LLVM_LINK_COMPONENTS Support)
-add_clang_tool(offload-arch OffloadArch.cpp NVPTXArch.cpp AMDGPUArchByKFD.cpp
AMDGPUArchByHIP.cpp)
+add_clang_tool(offload-arch OffloadArch.cpp NVPTXArch.cpp AMDGPUArchByKFD.cpp
+ AMDGPUArchByHIP.cpp LevelZeroArch.cpp)
+
+find_path(OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR NAMES level_zero/ze_api.h)
+if (OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR)
+ target_include_directories(offload-arch PRIVATE
${OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR})
+ target_compile_definitions(offload-arch PRIVATE HAVE_LEVEL_ZERO_HEADERS)
+endif()
add_clang_symlink(amdgpu-arch offload-arch)
add_clang_symlink(nvptx-arch offload-arch)
+add_clang_symlink(intelgpu-arch offload-arch)
target_link_libraries(offload-arch PRIVATE clangBasic)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
new file mode 100644
index 0000000000000..8b6b393f6f9f6
--- /dev/null
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -0,0 +1,133 @@
+//===- LevelZeroArch.cpp - list installed Level Zero devices ---*- C++
-*--===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM
Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements a tool for detecting Level Zero devices installed in
the
+// system
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef HAVE_LEVEL_ZERO_HEADERS
+
+int printGPUsByLevelZero() {
+ return 0;
+}
+
+#else
+
+#include "clang/Basic/Version.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Support/Error.h"
+#include <cstdint>
+#include <cstdio>
+#include <memory>
+#include <level_zero/ze_api.h>
+
+using namespace llvm;
+extern cl::opt<bool> Verbose;
+
+#define DEFINE_WRAPPER(NAME)
\
+ using NAME##_ty = decltype(NAME);
\
+ void *NAME##Ptr = nullptr;
\
+ template <class... Ts> ze_result_t NAME##_wrap(Ts... args) {
\
+ if (!NAME##Ptr) {
\
+ return ZE_RESULT_ERROR_UNKNOWN;
\
+ }
\
+ return reinterpret_cast<NAME##_ty *>(NAME##Ptr)(args...);
\
+ };
+
+DEFINE_WRAPPER(zeInitDrivers)
+DEFINE_WRAPPER(zeDeviceGet)
+DEFINE_WRAPPER(zeDeviceGetProperties)
+
+static bool loadLevelZero() {
+ const char *L0Library = "libze_loader.so";
+ std::string ErrMsg;
+
+ auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>(
+ llvm::sys::DynamicLibrary::getPermanentLibrary(L0Library, &ErrMsg));
+ if (!DynlibHandle->isValid()) {
+ if (ErrMsg.empty())
+ ErrMsg = "unknown error";
+ if (Verbose)
+ llvm::errs() << "Unable to load library '" << L0Library << "': " <<
ErrMsg
+ << "!\n";
+ return false;
+ }
+
+ constexpr struct {
+ const char *name;
+ void **fptr;
+ } dlwrap[] = {
+ {"zeInitDrivers", &zeInitDriversPtr},
+ {"zeDeviceGet", &zeDeviceGetPtr},
+ {"zeDeviceGetProperties", &zeDeviceGetPropertiesPtr},
+ };
+
+ for (auto entry : dlwrap) {
+ void *P = DynlibHandle->getAddressOfSymbol(entry.name);
+ if (P == nullptr) {
+ if (Verbose)
+ llvm::errs() << "Unable to find '" << entry.name << "' in '" <<
L0Library
+ << "'!\n";
+ return false;
+ }
+ *(entry.fptr) = P;
+ }
+
+ return true;
+}
+
+#define CALL_ZE_AND_CHECK(Fn, ...)
\
+ do {
\
+ ze_result_t Rc = Fn##_wrap(__VA_ARGS__);
\
+ if (Rc != ZE_RESULT_SUCCESS) {
\
+ if (Verbose)
\
+ llvm::errs() << "Error: " << __func__ << ":" << #Fn
\
+ << " failed with error code " << Rc << "\n";
\
+ return 1;
\
+ }
\
+ } while (0)
+
+int printGPUsByLevelZero() {
+ if (!loadLevelZero())
+ return 1;
+
+ ze_init_driver_type_desc_t driver_type = {};
+ driver_type.stype = ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC;
+ driver_type.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU;
+ driver_type.pNext = nullptr;
+ uint32_t driverCount{0};
+
+ // Initialize and find all drivers
+ CALL_ZE_AND_CHECK(zeInitDrivers, &driverCount, nullptr, &driver_type);
+
+ llvm::SmallVector<ze_driver_handle_t> drivers(driverCount);
+ CALL_ZE_AND_CHECK(zeInitDrivers, &driverCount, drivers.data(), &driver_type);
+
+ for (auto driver : drivers) {
+ // Discover all the devices for a given driver
+ uint32_t deviceCount = 0;
+ CALL_ZE_AND_CHECK(zeDeviceGet, driver, &deviceCount, nullptr);
+
+ llvm::SmallVector<ze_device_handle_t> devices(deviceCount);
+ CALL_ZE_AND_CHECK(zeDeviceGet, driver, &deviceCount, devices.data());
+
+ for (auto device : devices) {
+ // Get device properties
+ ze_device_properties_t deviceProperties;
+ CALL_ZE_AND_CHECK(zeDeviceGetProperties, device, &deviceProperties);
+ // Print device name
+ llvm::outs() << deviceProperties.name << '\n';
+ }
+ }
+
+ return 0;
+}
+
+#endif // HAVE_LEVEL_ZERO_HEADERS
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index 74be40214a0ec..5043c00986a9b 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -21,6 +21,7 @@ enum VendorName {
all,
amdgpu,
nvptx,
+ intel,
};
static cl::opt<VendorName>
@@ -28,7 +29,8 @@ static cl::opt<VendorName>
cl::init(all),
cl::values(clEnumVal(all, "Print all GPUs (default)"),
clEnumVal(amdgpu, "Only print AMD GPUs"),
- clEnumVal(nvptx, "Only print NVIDIA GPUs")));
+ clEnumVal(nvptx, "Only print NVIDIA GPUs"),
+ clEnumVal(intel, "Only print Intel GPUs")));
cl::opt<bool> Verbose("verbose", cl::desc("Enable verbose output"),
cl::init(false), cl::cat(OffloadArchCategory));
@@ -40,6 +42,7 @@ static void PrintVersion(raw_ostream &OS) {
int printGPUsByKFD();
int printGPUsByHIP();
int printGPUsByCUDA();
+int printGPUsByLevelZero();
static int printAMD() {
#ifndef _WIN32
@@ -51,6 +54,7 @@ static int printAMD() {
}
static int printNVIDIA() { return printGPUsByCUDA(); }
+static int printIntel() { return printGPUsByLevelZero(); }
int main(int argc, char *argv[]) {
cl::HideUnrelatedOptions(OffloadArchCategory);
@@ -73,15 +77,22 @@ int main(int argc, char *argv[]) {
sys::path::stem(argv[0]).starts_with("amdgpu-arch");
bool NVIDIAOnly = Only == VendorName::nvptx ||
sys::path::stem(argv[0]).starts_with("nvptx-arch");
+ bool IntelOnly = Only == VendorName::intel ||
+ sys::path::stem(argv[0]).starts_with("intelgpu-arch");
+ bool All = !AMDGPUOnly && !NVIDIAOnly && !IntelOnly;
int NVIDIAResult = 0;
- if (!AMDGPUOnly)
+ if (NVIDIAOnly || All)
NVIDIAResult = printNVIDIA();
int AMDResult = 0;
- if (!NVIDIAOnly)
+ if (AMDGPUOnly || All)
AMDResult = printAMD();
+ int IntelResult = 0;
+ if (IntelOnly || All)
+ IntelResult = printIntel();
+
// We only failed if all cases returned an error.
- return AMDResult && NVIDIAResult;
+ return AMDResult && NVIDIAResult && IntelResult;
}
>From e8880084aa18c161e217099b49fea62c6b95fb92 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 19:44:21 +0200
Subject: [PATCH 02/10] cleanup
---
clang/tools/offload-arch/LevelZeroArch.cpp | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index 8b6b393f6f9f6..fae98d17240ed 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -13,19 +13,14 @@
#ifndef HAVE_LEVEL_ZERO_HEADERS
-int printGPUsByLevelZero() {
- return 0;
-}
+int printGPUsByLevelZero() { return 0; }
#else
-#include "clang/Basic/Version.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/Error.h"
-#include <cstdint>
#include <cstdio>
-#include <memory>
#include <level_zero/ze_api.h>
using namespace llvm;
@@ -56,7 +51,7 @@ static bool loadLevelZero() {
ErrMsg = "unknown error";
if (Verbose)
llvm::errs() << "Unable to load library '" << L0Library << "': " <<
ErrMsg
- << "!\n";
+ << "\n";
return false;
}
@@ -73,8 +68,8 @@ static bool loadLevelZero() {
void *P = DynlibHandle->getAddressOfSymbol(entry.name);
if (P == nullptr) {
if (Verbose)
- llvm::errs() << "Unable to find '" << entry.name << "' in '" <<
L0Library
- << "'!\n";
+ llvm::errs() << "Unable to find '" << entry.name << "' in '"
+ << L0Library << "'\n";
return false;
}
*(entry.fptr) = P;
>From b4e3780a19c6f1477b582eacb1572c60ae92fc8b Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 22:33:39 +0200
Subject: [PATCH 03/10] Refactor main
---
clang/tools/offload-arch/LevelZeroArch.cpp | 4 +-
clang/tools/offload-arch/OffloadArch.cpp | 50 ++++++++++++----------
2 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index fae98d17240ed..32080e8f8af7a 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -41,7 +41,7 @@ DEFINE_WRAPPER(zeDeviceGet)
DEFINE_WRAPPER(zeDeviceGetProperties)
static bool loadLevelZero() {
- const char *L0Library = "libze_loader.so";
+ constexpr const char *L0Library = "libze_loader.so";
std::string ErrMsg;
auto DynlibHandle = std::make_unique<llvm::sys::DynamicLibrary>(
@@ -114,10 +114,8 @@ int printGPUsByLevelZero() {
CALL_ZE_AND_CHECK(zeDeviceGet, driver, &deviceCount, devices.data());
for (auto device : devices) {
- // Get device properties
ze_device_properties_t deviceProperties;
CALL_ZE_AND_CHECK(zeDeviceGetProperties, device, &deviceProperties);
- // Print device name
llvm::outs() << deviceProperties.name << '\n';
}
}
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index 5043c00986a9b..0de0befda98e7 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -56,6 +56,17 @@ static int printAMD() {
static int printNVIDIA() { return printGPUsByCUDA(); }
static int printIntel() { return printGPUsByLevelZero(); }
+struct vendor_entry_t {
+ VendorName name;
+ llvm::StringRef alias;
+ int (*printFunc)();
+ bool onlyThis;
+};
+std::array<vendor_entry_t, 3> VendorTable{
+ {{VendorName::amdgpu, "amdgpu-arch", printAMD, false},
+ {VendorName::nvptx, "nvptx-arch", printNVIDIA, false},
+ {VendorName::intel, "intelgpu-arch", printIntel, false}}};
+
int main(int argc, char *argv[]) {
cl::HideUnrelatedOptions(OffloadArchCategory);
@@ -72,27 +83,20 @@ int main(int argc, char *argv[]) {
return 0;
}
- // If this was invoked from the legacy symlinks provide the same behavior.
- bool AMDGPUOnly = Only == VendorName::amdgpu ||
- sys::path::stem(argv[0]).starts_with("amdgpu-arch");
- bool NVIDIAOnly = Only == VendorName::nvptx ||
- sys::path::stem(argv[0]).starts_with("nvptx-arch");
- bool IntelOnly = Only == VendorName::intel ||
- sys::path::stem(argv[0]).starts_with("intelgpu-arch");
- bool All = !AMDGPUOnly && !NVIDIAOnly && !IntelOnly;
-
- int NVIDIAResult = 0;
- if (NVIDIAOnly || All)
- NVIDIAResult = printNVIDIA();
-
- int AMDResult = 0;
- if (AMDGPUOnly || All)
- AMDResult = printAMD();
-
- int IntelResult = 0;
- if (IntelOnly || All)
- IntelResult = printIntel();
-
- // We only failed if all cases returned an error.
- return AMDResult && NVIDIAResult && IntelResult;
+ bool All = true;
+ llvm::for_each(VendorTable, [&](auto &entry) {
+ entry.onlyThis =
+ entry.name == Only ||
sys::path::stem(argv[0]).starts_with(entry.alias);
+ if (entry.onlyThis)
+ All = false;
+ });
+
+ llvm::SmallVector<int> results(VendorTable.size());
+ llvm::transform(VendorTable, results.begin(), [&](const auto &entry) {
+ if (entry.onlyThis || All)
+ return entry.printFunc();
+ return 0;
+ });
+
+ return llvm::all_of(results, [](int r) { return r == 1; });
}
>From abba395aab57c3cb0fc606bea6a6dd12e594bbd4 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 22:51:55 +0200
Subject: [PATCH 04/10] Inline level zero header
---
clang/tools/offload-arch/CMakeLists.txt | 6 --
clang/tools/offload-arch/LevelZeroArch.cpp | 70 +++++++++++++++++++---
2 files changed, 61 insertions(+), 15 deletions(-)
diff --git a/clang/tools/offload-arch/CMakeLists.txt
b/clang/tools/offload-arch/CMakeLists.txt
index 187c4d9517551..5035022cb2678 100644
--- a/clang/tools/offload-arch/CMakeLists.txt
+++ b/clang/tools/offload-arch/CMakeLists.txt
@@ -3,12 +3,6 @@ set(LLVM_LINK_COMPONENTS Support)
add_clang_tool(offload-arch OffloadArch.cpp NVPTXArch.cpp AMDGPUArchByKFD.cpp
AMDGPUArchByHIP.cpp LevelZeroArch.cpp)
-find_path(OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR NAMES level_zero/ze_api.h)
-if (OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR)
- target_include_directories(offload-arch PRIVATE
${OFFLOAD_ARCH_LEVEL_ZERO_INCLUDE_DIR})
- target_compile_definitions(offload-arch PRIVATE HAVE_LEVEL_ZERO_HEADERS)
-endif()
-
add_clang_symlink(amdgpu-arch offload-arch)
add_clang_symlink(nvptx-arch offload-arch)
add_clang_symlink(intelgpu-arch offload-arch)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index 32080e8f8af7a..3df244fe15502 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -11,17 +11,71 @@
//
//===----------------------------------------------------------------------===//
-#ifndef HAVE_LEVEL_ZERO_HEADERS
-
-int printGPUsByLevelZero() { return 0; }
-
-#else
-
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/DynamicLibrary.h"
#include "llvm/Support/Error.h"
#include <cstdio>
-#include <level_zero/ze_api.h>
+
+#define ZE_MAX_DEVICE_NAME 256
+#define ZE_MAX_DEVICE_UUID_SIZE 16
+
+typedef void *ze_driver_handle_t;
+typedef void *ze_device_handle_t;
+
+enum ze_result_t {
+ ZE_RESULT_SUCCESS = 0,
+ ZE_RESULT_ERROR_UNKNOWN = 0x7ffffffe
+};
+
+enum ze_structure_type_t {
+ ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC = 0x00020021,
+ ZE_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff
+};
+
+enum ze_init_driver_type_flags_t { ZE_INIT_DRIVER_TYPE_FLAG_GPU = 1 };
+
+typedef uint32_t ze_device_type_t;
+typedef uint32_t ze_device_property_flags_t;
+
+struct ze_init_driver_type_desc_t {
+ ze_structure_type_t stype;
+ const void *pNext;
+ ze_init_driver_type_flags_t flags;
+};
+
+typedef struct _ze_device_uuid_t {
+ uint8_t id[ZE_MAX_DEVICE_UUID_SIZE];
+} ze_device_uuid_t;
+
+typedef struct _ze_device_properties_t {
+ ze_structure_type_t stype;
+ void *pNext;
+ ze_device_type_t type;
+ uint32_t vendorId;
+ uint32_t deviceId;
+ ze_device_property_flags_t flags;
+ uint32_t subdeviceId;
+ uint32_t coreClockRate;
+ uint64_t maxMemAllocSize;
+ uint32_t maxHardwareContexts;
+ uint32_t maxCommandQueuePriority;
+ uint32_t numThreadsPerEU;
+ uint32_t physicalEUSimdWidth;
+ uint32_t numEUsPerSubslice;
+ uint32_t numSubslicesPerSlice;
+ uint32_t numSlices;
+ uint64_t timerResolution;
+ uint32_t timestampValidBits;
+ uint32_t kernelTimestampValidBits;
+ ze_device_uuid_t uuid;
+ char name[ZE_MAX_DEVICE_NAME];
+} ze_device_properties_t;
+
+ze_result_t zeInitDrivers(uint32_t *pCount, ze_driver_handle_t *phDrivers,
+ ze_init_driver_type_desc_t *desc);
+ze_result_t zeDeviceGet(ze_driver_handle_t hDriver, uint32_t *pCount,
+ void *phDevices);
+ze_result_t zeDeviceGetProperties(void *hDevice, void *pProperties);
using namespace llvm;
extern cl::opt<bool> Verbose;
@@ -122,5 +176,3 @@ int printGPUsByLevelZero() {
return 0;
}
-
-#endif // HAVE_LEVEL_ZERO_HEADERS
>From 05f4dbba2d9dc6c26b63dad38a1ac99bd63f76d9 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 23:25:41 +0200
Subject: [PATCH 05/10] continue refactor
---
clang/tools/offload-arch/CMakeLists.txt | 2 +-
clang/tools/offload-arch/OffloadArch.cpp | 25 ++++++++++--------------
2 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/clang/tools/offload-arch/CMakeLists.txt
b/clang/tools/offload-arch/CMakeLists.txt
index 5035022cb2678..1398d7576bdb5 100644
--- a/clang/tools/offload-arch/CMakeLists.txt
+++ b/clang/tools/offload-arch/CMakeLists.txt
@@ -3,8 +3,8 @@ set(LLVM_LINK_COMPONENTS Support)
add_clang_tool(offload-arch OffloadArch.cpp NVPTXArch.cpp AMDGPUArchByKFD.cpp
AMDGPUArchByHIP.cpp LevelZeroArch.cpp)
+#alternatetave legacy binary names
add_clang_symlink(amdgpu-arch offload-arch)
add_clang_symlink(nvptx-arch offload-arch)
-add_clang_symlink(intelgpu-arch offload-arch)
target_link_libraries(offload-arch PRIVATE clangBasic)
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index 0de0befda98e7..8cf422ab4b227 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -58,14 +58,11 @@ static int printIntel() { return printGPUsByLevelZero(); }
struct vendor_entry_t {
VendorName name;
- llvm::StringRef alias;
- int (*printFunc)();
- bool onlyThis;
+ function_ref<int()> printFunc;
};
-std::array<vendor_entry_t, 3> VendorTable{
- {{VendorName::amdgpu, "amdgpu-arch", printAMD, false},
- {VendorName::nvptx, "nvptx-arch", printNVIDIA, false},
- {VendorName::intel, "intelgpu-arch", printIntel, false}}};
+std::array<vendor_entry_t, 3> VendorTable{{{VendorName::amdgpu, printAMD},
+ {VendorName::nvptx, printNVIDIA},
+ {VendorName::intel, printIntel}}};
int main(int argc, char *argv[]) {
cl::HideUnrelatedOptions(OffloadArchCategory);
@@ -83,17 +80,15 @@ int main(int argc, char *argv[]) {
return 0;
}
- bool All = true;
- llvm::for_each(VendorTable, [&](auto &entry) {
- entry.onlyThis =
- entry.name == Only ||
sys::path::stem(argv[0]).starts_with(entry.alias);
- if (entry.onlyThis)
- All = false;
- });
+ // Support legacy binaries
+ if (sys::path::stem(argv[0]).starts_with("amdgpu-arch"))
+ Only = VendorName::amdgpu;
+ if (sys::path::stem(argv[0]).starts_with("nvptx-arch"))
+ Only = VendorName::nvptx;
llvm::SmallVector<int> results(VendorTable.size());
llvm::transform(VendorTable, results.begin(), [&](const auto &entry) {
- if (entry.onlyThis || All)
+ if (Only == VendorName::all || Only == entry.name)
return entry.printFunc();
return 0;
});
>From 4e8437ccb0d0ce105f692de19aea3e7a7c7d78be Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Wed, 24 Sep 2025 23:27:06 +0200
Subject: [PATCH 06/10] Update clang/tools/offload-arch/CMakeLists.txt
Co-authored-by: Joseph Huber <hube...@outlook.com>
---
clang/tools/offload-arch/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/clang/tools/offload-arch/CMakeLists.txt
b/clang/tools/offload-arch/CMakeLists.txt
index 1398d7576bdb5..f7d7012cf7272 100644
--- a/clang/tools/offload-arch/CMakeLists.txt
+++ b/clang/tools/offload-arch/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS Support)
add_clang_tool(offload-arch OffloadArch.cpp NVPTXArch.cpp AMDGPUArchByKFD.cpp
AMDGPUArchByHIP.cpp LevelZeroArch.cpp)
-#alternatetave legacy binary names
+# Legacy binary names.
add_clang_symlink(amdgpu-arch offload-arch)
add_clang_symlink(nvptx-arch offload-arch)
>From 3dbb8dd0b1913a8b2c7f6de4ed2a8431b8f7f374 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Thu, 25 Sep 2025 00:09:15 +0200
Subject: [PATCH 07/10] simplify main, renaming, ...
---
clang/tools/offload-arch/LevelZeroArch.cpp | 54 +++++++++++-----------
clang/tools/offload-arch/OffloadArch.cpp | 20 ++++----
2 files changed, 36 insertions(+), 38 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index 3df244fe15502..cf0b7c2da9d50 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -29,6 +29,7 @@ enum ze_result_t {
enum ze_structure_type_t {
ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC = 0x00020021,
+ ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES = 0x3,
ZE_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff
};
@@ -83,7 +84,7 @@ extern cl::opt<bool> Verbose;
#define DEFINE_WRAPPER(NAME)
\
using NAME##_ty = decltype(NAME);
\
void *NAME##Ptr = nullptr;
\
- template <class... Ts> ze_result_t NAME##_wrap(Ts... args) {
\
+ template <class... Ts> ze_result_t NAME##Wrapper(Ts... args) {
\
if (!NAME##Ptr) {
\
return ZE_RESULT_ERROR_UNKNOWN;
\
}
\
@@ -110,23 +111,23 @@ static bool loadLevelZero() {
}
constexpr struct {
- const char *name;
- void **fptr;
- } dlwrap[] = {
+ const char *Name;
+ void **FuncPtr;
+ } Wrappers [] = {
{"zeInitDrivers", &zeInitDriversPtr},
{"zeDeviceGet", &zeDeviceGetPtr},
{"zeDeviceGetProperties", &zeDeviceGetPropertiesPtr},
};
- for (auto entry : dlwrap) {
- void *P = DynlibHandle->getAddressOfSymbol(entry.name);
+ for (auto Entry : Wrappers) {
+ void *P = DynlibHandle->getAddressOfSymbol(Entry.Name);
if (P == nullptr) {
if (Verbose)
- llvm::errs() << "Unable to find '" << entry.name << "' in '"
+ llvm::errs() << "Unable to find '" << Entry.Name << "' in '"
<< L0Library << "'\n";
return false;
}
- *(entry.fptr) = P;
+ *(Entry.FuncPtr) = P;
}
return true;
@@ -134,7 +135,7 @@ static bool loadLevelZero() {
#define CALL_ZE_AND_CHECK(Fn, ...)
\
do {
\
- ze_result_t Rc = Fn##_wrap(__VA_ARGS__);
\
+ ze_result_t Rc = Fn##Wrapper(__VA_ARGS__);
\
if (Rc != ZE_RESULT_SUCCESS) {
\
if (Verbose)
\
llvm::errs() << "Error: " << __func__ << ":" << #Fn
\
@@ -147,30 +148,31 @@ int printGPUsByLevelZero() {
if (!loadLevelZero())
return 1;
- ze_init_driver_type_desc_t driver_type = {};
- driver_type.stype = ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC;
- driver_type.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU;
- driver_type.pNext = nullptr;
- uint32_t driverCount{0};
+ ze_init_driver_type_desc_t DriverType = {};
+ DriverType.stype = ZE_STRUCTURE_TYPE_INIT_DRIVER_TYPE_DESC;
+ DriverType.flags = ZE_INIT_DRIVER_TYPE_FLAG_GPU;
+ DriverType.pNext = nullptr;
+ uint32_t DriverCount{0};
// Initialize and find all drivers
- CALL_ZE_AND_CHECK(zeInitDrivers, &driverCount, nullptr, &driver_type);
+ CALL_ZE_AND_CHECK(zeInitDrivers, &DriverCount, nullptr, &DriverType);
- llvm::SmallVector<ze_driver_handle_t> drivers(driverCount);
- CALL_ZE_AND_CHECK(zeInitDrivers, &driverCount, drivers.data(), &driver_type);
+ llvm::SmallVector<ze_driver_handle_t> Drivers(DriverCount);
+ CALL_ZE_AND_CHECK(zeInitDrivers, &DriverCount, Drivers.data(), &DriverType);
- for (auto driver : drivers) {
+ for (auto Driver : Drivers) {
// Discover all the devices for a given driver
- uint32_t deviceCount = 0;
- CALL_ZE_AND_CHECK(zeDeviceGet, driver, &deviceCount, nullptr);
+ uint32_t DeviceCount = 0;
+ CALL_ZE_AND_CHECK(zeDeviceGet, Driver, &DeviceCount, nullptr);
- llvm::SmallVector<ze_device_handle_t> devices(deviceCount);
- CALL_ZE_AND_CHECK(zeDeviceGet, driver, &deviceCount, devices.data());
+ llvm::SmallVector<ze_device_handle_t> Devices(DeviceCount);
+ CALL_ZE_AND_CHECK(zeDeviceGet, Driver, &DeviceCount, Devices.data());
- for (auto device : devices) {
- ze_device_properties_t deviceProperties;
- CALL_ZE_AND_CHECK(zeDeviceGetProperties, device, &deviceProperties);
- llvm::outs() << deviceProperties.name << '\n';
+ for (auto device : Devices) {
+ ze_device_properties_t DeviceProperties{
+ ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES, nullptr};
+ CALL_ZE_AND_CHECK(zeDeviceGetProperties, device, &DeviceProperties);
+ llvm::outs() << DeviceProperties.name << '\n';
}
}
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index 8cf422ab4b227..b5e43ae1716de 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -56,11 +56,8 @@ static int printAMD() {
static int printNVIDIA() { return printGPUsByCUDA(); }
static int printIntel() { return printGPUsByLevelZero(); }
-struct vendor_entry_t {
- VendorName name;
- function_ref<int()> printFunc;
-};
-std::array<vendor_entry_t, 3> VendorTable{{{VendorName::amdgpu, printAMD},
+const std::array<std::pair<VendorName, function_ref<int()>>, 3> VendorTable{{
+ {VendorName::amdgpu, printAMD},
{VendorName::nvptx, printNVIDIA},
{VendorName::intel, printIntel}}};
@@ -86,12 +83,11 @@ int main(int argc, char *argv[]) {
if (sys::path::stem(argv[0]).starts_with("nvptx-arch"))
Only = VendorName::nvptx;
- llvm::SmallVector<int> results(VendorTable.size());
- llvm::transform(VendorTable, results.begin(), [&](const auto &entry) {
- if (Only == VendorName::all || Only == entry.name)
- return entry.printFunc();
- return 0;
- });
+ int Result = 1;
+ for (auto [Name, Func] : VendorTable) {
+ if (Only == VendorName::all || Only == Name)
+ Result &= Func();
+ }
- return llvm::all_of(results, [](int r) { return r == 1; });
+ return Result;
}
>From b967056737ea2083fb27691d8c9ff8ab027045e4 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Thu, 25 Sep 2025 00:09:47 +0200
Subject: [PATCH 08/10] format
---
clang/tools/offload-arch/LevelZeroArch.cpp | 2 +-
clang/tools/offload-arch/OffloadArch.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index cf0b7c2da9d50..af70a3e8c27d6 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -113,7 +113,7 @@ static bool loadLevelZero() {
constexpr struct {
const char *Name;
void **FuncPtr;
- } Wrappers [] = {
+ } Wrappers[] = {
{"zeInitDrivers", &zeInitDriversPtr},
{"zeDeviceGet", &zeDeviceGetPtr},
{"zeDeviceGetProperties", &zeDeviceGetPropertiesPtr},
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index b5e43ae1716de..8d12d1d8288c7 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -56,10 +56,10 @@ static int printAMD() {
static int printNVIDIA() { return printGPUsByCUDA(); }
static int printIntel() { return printGPUsByLevelZero(); }
-const std::array<std::pair<VendorName, function_ref<int()>>, 3> VendorTable{{
- {VendorName::amdgpu, printAMD},
- {VendorName::nvptx, printNVIDIA},
- {VendorName::intel, printIntel}}};
+const std::array<std::pair<VendorName, function_ref<int()>>, 3> VendorTable{
+ {{VendorName::amdgpu, printAMD},
+ {VendorName::nvptx, printNVIDIA},
+ {VendorName::intel, printIntel}}};
int main(int argc, char *argv[]) {
cl::HideUnrelatedOptions(OffloadArchCategory);
>From f378358ff60d9ad433bebe98116f14d5146334b8 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Thu, 25 Sep 2025 19:01:56 +0200
Subject: [PATCH 09/10] dot the comments
---
clang/tools/offload-arch/LevelZeroArch.cpp | 4 ++--
clang/tools/offload-arch/OffloadArch.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index af70a3e8c27d6..ba419c4ad5df8 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -154,14 +154,14 @@ int printGPUsByLevelZero() {
DriverType.pNext = nullptr;
uint32_t DriverCount{0};
- // Initialize and find all drivers
+ // Initialize and find all drivers.
CALL_ZE_AND_CHECK(zeInitDrivers, &DriverCount, nullptr, &DriverType);
llvm::SmallVector<ze_driver_handle_t> Drivers(DriverCount);
CALL_ZE_AND_CHECK(zeInitDrivers, &DriverCount, Drivers.data(), &DriverType);
for (auto Driver : Drivers) {
- // Discover all the devices for a given driver
+ // Discover all the devices for a given driver.
uint32_t DeviceCount = 0;
CALL_ZE_AND_CHECK(zeDeviceGet, Driver, &DeviceCount, nullptr);
diff --git a/clang/tools/offload-arch/OffloadArch.cpp
b/clang/tools/offload-arch/OffloadArch.cpp
index 8d12d1d8288c7..3c5131eb7c06c 100644
--- a/clang/tools/offload-arch/OffloadArch.cpp
+++ b/clang/tools/offload-arch/OffloadArch.cpp
@@ -77,7 +77,7 @@ int main(int argc, char *argv[]) {
return 0;
}
- // Support legacy binaries
+ // Support legacy binaries.
if (sys::path::stem(argv[0]).starts_with("amdgpu-arch"))
Only = VendorName::amdgpu;
if (sys::path::stem(argv[0]).starts_with("nvptx-arch"))
>From cbe08f27ac4dce8121ce98de6bedab745d0316c5 Mon Sep 17 00:00:00 2001
From: Alex Duran <alejandro.du...@intel.com>
Date: Thu, 25 Sep 2025 19:04:14 +0200
Subject: [PATCH 10/10] fix some nits
---
clang/tools/offload-arch/LevelZeroArch.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/clang/tools/offload-arch/LevelZeroArch.cpp
b/clang/tools/offload-arch/LevelZeroArch.cpp
index ba419c4ad5df8..6ac6d4ae7edb5 100644
--- a/clang/tools/offload-arch/LevelZeroArch.cpp
+++ b/clang/tools/offload-arch/LevelZeroArch.cpp
@@ -19,8 +19,8 @@
#define ZE_MAX_DEVICE_NAME 256
#define ZE_MAX_DEVICE_UUID_SIZE 16
-typedef void *ze_driver_handle_t;
-typedef void *ze_device_handle_t;
+using ze_driver_handle_t = void *;
+using ze_device_handle_t = void *;
enum ze_result_t {
ZE_RESULT_SUCCESS = 0,
@@ -168,10 +168,10 @@ int printGPUsByLevelZero() {
llvm::SmallVector<ze_device_handle_t> Devices(DeviceCount);
CALL_ZE_AND_CHECK(zeDeviceGet, Driver, &DeviceCount, Devices.data());
- for (auto device : Devices) {
+ for (auto Device : Devices) {
ze_device_properties_t DeviceProperties{
ZE_STRUCTURE_TYPE_DEVICE_PROPERTIES, nullptr};
- CALL_ZE_AND_CHECK(zeDeviceGetProperties, device, &DeviceProperties);
+ CALL_ZE_AND_CHECK(zeDeviceGetProperties, Device, &DeviceProperties);
llvm::outs() << DeviceProperties.name << '\n';
}
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
