Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion sycl/test-e2e/KernelCompiler/sycl_device_globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
// UNSUPPORTED: opencl && gpu
// UNSUPPORTED-TRACKER: GSD-4287

// UNSUPPORTED: gpu-nvidia-geforce-rtx-3090
// UNSUPPORTED-TRACKER: https://github.com/intel/llvm/issues/20408

// RUN: %{build} -o %t.out
// RUN: %if hip %{ env SYCL_JIT_AMDGCN_PTX_TARGET_CPU=%{amd_arch} %} %{l0_leak_check} %{run} %t.out

Expand Down Expand Up @@ -80,7 +83,7 @@ int test_device_global() {
auto checkVal = [&](int32_t expected) {
val = -1;
q.memcpy(&val, dgAddr, dgSize).wait();
std::cout << "val: " << val << " == " << expected << '\n';
std::cout << "val: " << val << " == " << expected << std::endl;
assert(val == expected);
};

Expand Down
22 changes: 20 additions & 2 deletions sycl/test-e2e/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -1014,6 +1014,7 @@ def get_sycl_ls_verbose(sycl_device, env):
dev_aspects = []
dev_sg_sizes = []
architectures = set()
device_names = set()
# See format.py's parse_min_intel_driver_req for explanation.
is_intel_driver = False
intel_driver_ver = {}
Expand Down Expand Up @@ -1055,8 +1056,11 @@ def get_sycl_ls_verbose(sycl_device, env):
if re.match(r" *Architecture:", line):
_, architecture = line.strip().split(":", 1)
architectures.add(architecture.strip())
if re.match(r" *Name *:", line) and "Level-Zero V2" in line:
features.add("level_zero_v2_adapter")
if re.match(r" *Name *:", line):
_, device_name_str = line.strip().split(":", 1)
device_names.add(device_name_str.strip())
if "Level-Zero V2" in line:
features.add("level_zero_v2_adapter")

# TODO change to the set of backends
if re.match(r"\[offload:.*", line) and not is_offload_preferred_backend_set:
Expand Down Expand Up @@ -1124,10 +1128,24 @@ def get_sycl_ls_verbose(sycl_device, env):
)
)

# Add a normalized device-name feature, e.g. "gpu-nvidia-geforce-rtx-3090"
# derived from the "Name :" field reported by sycl-ls --verbose.
device_name_features = set(
"gpu-" + re.sub(r"[^a-z0-9]+", "-", name.lower()).strip("-")
for name in device_names
)
if device_name_features:
lit_config.note(
"Device name features for {}: {}".format(
sycl_device, ", ".join(device_name_features)
)
)

features.update(aspect_features)
features.update(sg_size_features)
features.update(architecture_feature)
features.update(device_family)
features.update(device_name_features)

be, dev = sycl_device.split(":")
if dev.isdigit():
Expand Down
Loading