Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SYCL][E2E] Fix bindless images tests to run on Level Zero devices #14779

Merged
merged 2 commits into from
Jul 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: linux
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include "../helpers/common.hpp"
#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_1D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this require a specific driver version? Should that be documented somewhere?

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come only this test requires these environment variables? Maybe we should add them to the LIT environment for all Bindless tests?

Copy link
Contributor

@wenju-he wenju-he Jul 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these env are required for all tests in this PR for https://github.com/intel/compute-runtime/releases/tag/24.26.30049.6 release

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_2D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_2D_dynamic.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_3D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_norm_types.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %{run} %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <limits>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_1D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_1D_subregion.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_2D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_2D_subregion.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_3D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_3D_subregion.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/read_write_unsampled.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include "helpers/common.hpp"
#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/sampling_1D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/sampling_2D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/sampling_2D_half.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)
// REQUIRES: aspect-fp16

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
4 changes: 2 additions & 2 deletions sycl/test-e2e/bindless_images/sampling_3D.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)

// RUN: %{build} -o %t.out
// RUN: %t.out
// RUN: env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

#include <iostream>
#include <sycl/detail/core.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// REQUIRES: cuda
// REQUIRES: cuda || (level_zero && gpu-intel-dg2)
// REQUIRES: vulkan

// RUN: %{build} %link-vulkan -o %t.out
// RUN: %{run} %t.out
// RUN: %{run} env NEOReadDebugKeys=1 UseBindlessMode=1 UseExternalAllocatorForSshAndDsh=1 %t.out

// Uncomment to print additional test information
// #define VERBOSE_PRINT
Expand Down
Loading