[SYCL] Add Panther Lake H & U to sycl_ext_oneapi_device_architecture #16294
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,9 +17,29 @@ inline namespace _V1 { | |
| namespace ext::oneapi::experimental { | ||
|
|
||
| enum class architecture : uint64_t { | ||
| // If new device architecture is added to sycl_ext_oneapi_device_architecture: | ||
| // | ||
| // Update | ||
| // - device_architecture.def file in the same directory | ||
| // - "detail::min_<category>_architecture" below if needed | ||
| // - "detail::max_<category>_architecture" below if needed | ||
| // - sycl_ext_oneapi_device_architecture specification doc | ||
| // - "-fsycl-targets" description in sycl/doc/UsersManual.md | ||
| // | ||
| // Add | ||
| // - new value for -fsycl-targets option to the compiler driver in | ||
| // accordance with changes from sycl/doc/UsersManual.md and update the | ||
| // compiler driver tests | ||
| // - ___SYCL_TARGET_<ARCH>__ to the compiler driver and to all places below | ||
| // - the unique ID of the new architecture to the SYCL RT source code to | ||
| // support querying the device architecture through | ||
| // device::get_info<ext::oneapi::experimental::info::device::architecture> | ||
| // - supported aspects of architecture in | ||
| // llvm/include/llvm/SYCLLowerIR/DeviceConfigFile.td | ||
| // | ||
| #define __SYCL_ARCHITECTURE(NAME, VAL) NAME = VAL, | ||
| #define __SYCL_ARCHITECTURE_ALIAS(NAME, VAL) NAME = VAL, | ||
| #include <sycl/ext/oneapi/experimental/device_architecture.def> | ||
| #undef __SYCL_ARCHITECTURE | ||
| #undef __SYCL_ARCHITECTURE_ALIAS | ||
| }; | ||
|
|
@@ -52,7 +72,7 @@ static constexpr ext::oneapi::experimental::architecture | |
| ext::oneapi::experimental::architecture::intel_gpu_bdw; | ||
| static constexpr ext::oneapi::experimental::architecture | ||
| max_intel_gpu_architecture = | ||
| ext::oneapi::experimental::architecture::intel_gpu_ptl_u; | ||
|
|
||
| static constexpr ext::oneapi::experimental::architecture | ||
| min_nvidia_gpu_architecture = | ||
|
|
@@ -152,6 +172,12 @@ static constexpr ext::oneapi::experimental::architecture | |
| #ifndef __SYCL_TARGET_INTEL_GPU_LNL_M__ | ||
| #define __SYCL_TARGET_INTEL_GPU_LNL_M__ 0 | ||
| #endif | ||
| #ifndef __SYCL_TARGET_INTEL_GPU_PTL_H__ | ||
| #define __SYCL_TARGET_INTEL_GPU_PTL_H__ 0 | ||
| #endif | ||
| #ifndef __SYCL_TARGET_INTEL_GPU_PTL_U__ | ||
| #define __SYCL_TARGET_INTEL_GPU_PTL_U__ 0 | ||
| #endif | ||
| #ifndef __SYCL_TARGET_NVIDIA_GPU_SM_50__ | ||
| #define __SYCL_TARGET_NVIDIA_GPU_SM_50__ 0 | ||
| #endif | ||
|
|
@@ -352,6 +378,8 @@ static constexpr bool is_allowable_aot_mode = | |
| (__SYCL_TARGET_INTEL_GPU_ARL_H__ == 1) || | ||
| (__SYCL_TARGET_INTEL_GPU_BMG_G21__ == 1) || | ||
| (__SYCL_TARGET_INTEL_GPU_LNL_M__ == 1) || | ||
| (__SYCL_TARGET_INTEL_GPU_PTL_H__ == 1) || | ||
| (__SYCL_TARGET_INTEL_GPU_PTL_U__ == 1) || | ||
| (__SYCL_TARGET_NVIDIA_GPU_SM_50__ == 1) || | ||
| (__SYCL_TARGET_NVIDIA_GPU_SM_52__ == 1) || | ||
| (__SYCL_TARGET_NVIDIA_GPU_SM_53__ == 1) || | ||
|
|
@@ -499,6 +527,12 @@ get_current_architecture_aot() { | |
| #if __SYCL_TARGET_INTEL_GPU_LNL_M__ | ||
| return ext::oneapi::experimental::architecture::intel_gpu_lnl_m; | ||
| #endif | ||
| #if __SYCL_TARGET_INTEL_GPU_PTL_H__ | ||
| return ext::oneapi::experimental::architecture::intel_gpu_ptl_h; | ||
| #endif | ||
| #if __SYCL_TARGET_INTEL_GPU_PTL_U__ | ||
| return ext::oneapi::experimental::architecture::intel_gpu_ptl_u; | ||
| #endif | ||
| #if __SYCL_TARGET_NVIDIA_GPU_SM_50__ | ||
| return ext::oneapi::experimental::architecture::nvidia_gpu_sm_50; | ||
| #endif | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -712,6 +712,10 @@ constexpr std::pair<const int, oneapi_exp_arch> IntelGPUArchitectures[] = { | |
| {0x05010000, oneapi_exp_arch::intel_gpu_lnl_m}, // A0 | ||
| {0x05010001, oneapi_exp_arch::intel_gpu_lnl_m}, // A1 | ||
| {0x05010004, oneapi_exp_arch::intel_gpu_lnl_m}, // B0 | ||
| {0x07800000, oneapi_exp_arch::intel_gpu_ptl_h}, // A0 | ||
| {0x07800004, oneapi_exp_arch::intel_gpu_ptl_h}, // B0 | ||
| {0x07804000, oneapi_exp_arch::intel_gpu_ptl_u}, // A0 | ||
| {0x07804001, oneapi_exp_arch::intel_gpu_ptl_u}, // A1 | ||
| }; | ||
|
|
||
| // Only for Intel CPU architectures | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1413,7 +1413,7 @@ const char *getArchName(const device &Device) { | |
| case syclex::architecture::ARCH: \ | ||
| return #ARCH; | ||
| #define __SYCL_ARCHITECTURE_ALIAS(ARCH, VAL) | ||
| #include <sycl/ext/oneapi/experimental/device_architecture.def> | ||
| #undef __SYCL_ARCHITECTURE | ||
| #undef __SYCL_ARCHITECTURE_ALIAS | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,7 +62,7 @@ | |
| // CHECK-NEXT: detail/info_desc_helpers.hpp | ||
| // CHECK-NEXT: info/info_desc.hpp | ||
| // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp | ||
| // CHECK-NEXT: ext/oneapi/experimental/device_architecture.def | ||
| // CHECK-NEXT: ext/oneapi/experimental/forward_progress.hpp | ||
| // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp | ||
| // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,7 +63,7 @@ | |
| // CHECK-NEXT: detail/info_desc_helpers.hpp | ||
| // CHECK-NEXT: info/info_desc.hpp | ||
| // CHECK-NEXT: ext/oneapi/experimental/device_architecture.hpp | ||
| // CHECK-NEXT: ext/oneapi/experimental/device_architecture.def | ||
| // CHECK-NEXT: ext/oneapi/experimental/forward_progress.hpp | ||
| // CHECK-NEXT: ext/oneapi/matrix/query-types.hpp | ||
| // CHECK-NEXT: ext/oneapi/matrix/matrix-unified-utils.hpp | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,7 +77,7 @@ const char *getArchName(const device &Device) { | |
| case syclex::architecture::ARCH: \ | ||
| return #ARCH; | ||
| #define __SYCL_ARCHITECTURE_ALIAS(ARCH, VAL) | ||
| #include <sycl/ext/oneapi/experimental/device_architecture.def> | ||
| #undef __SYCL_ARCHITECTURE | ||
| #undef __SYCL_ARCHITECTURE_ALIAS | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jzc can you please add instructions here? If they are too big, they can be moved to sycl/doc/developer folder and referenced here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The easiest way is to run
sycl-ls --verbose, but that requires you having the HW. Until you know the data, you can always register a target as not supporting anything.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jzc could you please add a doc and info about these new architectures in the separate upcoming PR?