Skip to content

Commit e6dcca4

Browse files
committed
Consolidate platform and adapter backend enums into one. (#17605)
second attempt to land intel/llvm#16173
1 parent 343b765 commit e6dcca4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+281
-401
lines changed

examples/codegen/codegen.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ std::vector<ur_adapter_handle_t>
4949
get_supported_adapters(std::vector<ur_adapter_handle_t> &adapters) {
5050
std::vector<ur_adapter_handle_t> supported_adapters;
5151
for (auto adapter : adapters) {
52-
ur_adapter_backend_t backend;
52+
ur_backend_t backend;
5353
ur_check(urAdapterGetInfo(adapter, UR_ADAPTER_INFO_BACKEND,
54-
sizeof(ur_adapter_backend_t), &backend, nullptr));
54+
sizeof(ur_backend_t), &backend, nullptr));
5555

56-
if (backend == UR_ADAPTER_BACKEND_LEVEL_ZERO) {
56+
if (backend == UR_BACKEND_LEVEL_ZERO) {
5757
supported_adapters.push_back(adapter);
5858
}
5959
}

include/ur_api.h

Lines changed: 25 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/ur_print.h

Lines changed: 11 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

include/ur_print.hpp

Lines changed: 37 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/YaML.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -838,8 +838,8 @@ namespace ur {
838838
* A manifest requires the following scalar fields: {`name`, `backend`}
839839
- `name` must be a string unique to the adapter.
840840
- `name` should be identical to how the name appears in the adapter's library name. E.g. `libur_adapter_my_adapter` should have the name string `my_adapter`.
841-
- `backend` must be an etor of `$x_adapter_backend_t`.
842-
- `backend` must not be `$X_ADAPTER_BACKEND_UNKNOWN`.
841+
- `backend` must be an etor of `$x_backend_t`.
842+
- `backend` must not be `$X_BACKEND_UNKNOWN`.
843843
* a manifest requires the following sequence of scalars: {`device_types`}
844844
- `device_types` must be an etor of `$x_device_type_t`
845845

scripts/core/adapter.yml

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ name: $x_adapter_info_t
133133
typed_etors: True
134134
etors:
135135
- name: BACKEND
136-
desc: "[$x_adapter_backend_t] Identifies the native backend supported by the adapter."
136+
desc: "[$x_backend_t] Identifies the native backend supported by the adapter."
137137
- name: REFERENCE_COUNT
138138
desc: |
139139
[uint32_t] Reference count of the adapter.
@@ -187,30 +187,6 @@ returns:
187187
- $X_RESULT_ERROR_OUT_OF_HOST_MEMORY
188188
--- #--------------------------------------------------------------------------
189189
type: enum
190-
desc: "Identifies backend of the adapter"
191-
class: $x
192-
name: $x_adapter_backend_t
193-
etors:
194-
- name: UNKNOWN
195-
value: "0"
196-
desc: "The backend is not a recognized one"
197-
- name: LEVEL_ZERO
198-
value: "1"
199-
desc: "The backend is Level Zero"
200-
- name: OPENCL
201-
value: "2"
202-
desc: "The backend is OpenCL"
203-
- name: CUDA
204-
value: "3"
205-
desc: "The backend is CUDA"
206-
- name: HIP
207-
value: "4"
208-
desc: "The backend is HIP"
209-
- name: NATIVE_CPU
210-
value: "5"
211-
desc: "The backend is Native CPU"
212-
--- #--------------------------------------------------------------------------
213-
type: enum
214190
desc: "Minimum level of messages to be processed by the logger."
215191
class: $xAdapter
216192
name: $x_logger_level_t

0 commit comments

Comments
 (0)