From 489d95e5fda5cb66aa77c2ee6b8b70eecfde707a Mon Sep 17 00:00:00 2001 From: Daniel Skrobot Date: Tue, 1 Oct 2024 11:55:49 +0200 Subject: [PATCH] [SYCL] Re-enable tests on PVC (#15555) Re-enable the KernelAndProgram/target_register_alloc_mode.cpp and DeviceCodeSplit/grf.cpp E2E tests on PVC by adding compiler flag for DeviceCodeSplit/grf.cpp in runs when old API is used and changing expected output in KernelAndProgram/target_register_alloc_mode.cpp to `urProgramBuildExp` instead of `urProgramBuild`. --- sycl/test-e2e/DeviceCodeSplit/grf.cpp | 6 ++---- .../KernelAndProgram/target_register_alloc_mode.cpp | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sycl/test-e2e/DeviceCodeSplit/grf.cpp b/sycl/test-e2e/DeviceCodeSplit/grf.cpp index 167c744bc90fc..a253828134805 100644 --- a/sycl/test-e2e/DeviceCodeSplit/grf.cpp +++ b/sycl/test-e2e/DeviceCodeSplit/grf.cpp @@ -14,10 +14,8 @@ // compiler option // REQUIRES: arch-intel_gpu_pvc -// https://github.com/intel/llvm/issues/14826 -// XFAIL: * -// RUN: %{build} -o %t.out +// RUN: %{build} -Wno-error=deprecated-declarations -o %t.out // Don't use SYCL_UR_TRACE as the output from the L0 adapter logging interferes // with the regular UR traces we are checking. // RUN: env UR_LOG_TRACING="level:info;output:stdout;flush:info" UR_ENABLE_LAYERS=UR_LAYER_TRACING %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR @@ -25,7 +23,7 @@ // RUN: %{build} -DUSE_NEW_API=1 -o %t.out // RUN: env UR_LOG_TRACING="level:info;output:stdout;flush:info" UR_ENABLE_LAYERS=UR_LAYER_TRACING %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-NO-VAR // RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" UR_LOG_TRACING="level:info;output:stdout;flush:info" UR_ENABLE_LAYERS=UR_LAYER_TRACING %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-WITH-VAR -// RUN: %{build} -DUSE_AUTO_GRF=1 -o %t.out +// RUN: %{build} -DUSE_AUTO_GRF=1 -Wno-error=deprecated-declarations -o %t.out // RUN: env UR_LOG_TRACING="level:info;output:stdout;flush:info" UR_ENABLE_LAYERS=UR_LAYER_TRACING %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-NO-VAR // RUN: env SYCL_PROGRAM_COMPILE_OPTIONS="-g" UR_LOG_TRACING="level:info;output:stdout;flush:info" UR_ENABLE_LAYERS=UR_LAYER_TRACING %{run} %t.out 2>&1 | FileCheck %s --check-prefixes=CHECK,CHECK-AUTO-WITH-VAR // RUN: %{build} -DUSE_NEW_API=1 -DUSE_AUTO_GRF=1 -o %t.out diff --git a/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp b/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp index 3c07f6805f23f..a3e2ba4ef61ea 100644 --- a/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp +++ b/sycl/test-e2e/KernelAndProgram/target_register_alloc_mode.cpp @@ -1,8 +1,5 @@ // REQUIRES: arch-intel_gpu_pvc -// https://github.com/intel/llvm/issues/14826 -// XFAIL: arch-intel_gpu_pvc - // RUN: %{build} -ftarget-register-alloc-mode=pvc:auto -o %t_with.out // RUN: %{build} -o %t_without.out // RUN: %{build} -ftarget-register-alloc-mode=pvc:default -o %t_default.out @@ -11,7 +8,7 @@ // RUN: env SYCL_UR_TRACE=2 %{run} %t_without.out 2>&1 | FileCheck %if system-windows %{ --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %} %else %{ --check-prefix=CHECK-OPT %} %s // RUN: env SYCL_UR_TRACE=2 %{run} %t_default.out 2>&1 | FileCheck --implicit-check-not=-ze-intel-enable-auto-large-GRF-mode %s -// CHECK-OPT: ---> urProgramBuild( +// CHECK-OPT: ---> urProgramBuildExp( // CHECK-SAME-OPT: -ze-intel-enable-auto-large-GRF-mode #include