Fix PoCL SYCL tests

Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
This commit is contained in:
2026-03-20 15:36:52 +01:00
parent 70023b719d
commit 2d90a92e69
2 changed files with 9 additions and 1 deletions

View File

@@ -26,7 +26,7 @@ let
cgh.single_task<hello_world>([=]() {
os << "Hello World! (on device)\n";
});
});
}).wait();
return 0;
} catch (sycl::exception &e) {
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
passthru = {
withPocl = finalAttrs.finalPackage.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pocl ];
name = old.name + "-pocl";
env = (old.env or { }) // {
POCL_DEBUG = "error,warn";
POCL_CACHE_DIR = "/build/pocl_cache";
@@ -71,6 +72,8 @@ stdenv.mkDerivation (finalAttrs: {
# Make PoCL report Intel vendor id so oneapi SYCL works
POCL_DRIVER_VERSION_OVERRIDE = "2024.18.6.0.02_160000";
POCL_CPU_VENDOR_ID_OVERRIDE = 32902;
HWLOC_SYNTHETIC = "node:1 core:1 pu:1";
};
doInstallCheck = true;
installCheckPhase = ''
@@ -78,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
});
withIntel = finalAttrs.finalPackage.overrideAttrs (old: {
name = old.name + "-intel";
env = (old.env or { }) // {
OCL_ICD_VENDORS = intelPackages.compiler + "/etc/OpenCL/vendors";
};

View File

@@ -52,6 +52,7 @@ intelPackages.stdenv.mkDerivation (finalAttrs: {
passthru = {
withPocl = finalAttrs.finalPackage.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pocl ];
name = old.name + "-pocl";
env = (old.env or { }) // {
POCL_DEBUG = "error,warn";
POCL_CACHE_DIR = "/build/pocl_cache";
@@ -59,6 +60,8 @@ intelPackages.stdenv.mkDerivation (finalAttrs: {
# Make PoCL report Intel vendor id so oneapi SYCL works
POCL_DRIVER_VERSION_OVERRIDE = "2024.18.6.0.02_160000";
POCL_CPU_VENDOR_ID_OVERRIDE = 32902;
HWLOC_SYNTHETIC = "node:1 core:1 pu:1";
};
doInstallCheck = true;
installCheckPhase = ''
@@ -67,6 +70,7 @@ intelPackages.stdenv.mkDerivation (finalAttrs: {
});
withIntel = finalAttrs.finalPackage.overrideAttrs (old: {
name = old.name + "-intel";
env = (old.env or { }) // {
OCL_ICD_VENDORS = intelPackages.compiler + "/etc/OpenCL/vendors";
};