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.

Sign up for GitHub

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] Add LIT feature for HIP #17692

Merged
merged 3 commits into from
Mar 28, 2025
Merged

[SYCL][E2E] Add LIT feature for HIP #17692

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a13923f
[SYCL] Add LIT feature for HIP
sarnex Mar 27, 2025
3d70ed8
format
sarnex Mar 27, 2025
b2f98c9
lib name
sarnex Mar 27, 2025
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
6 changes: 6 additions & 0 deletions sycl/test-e2e/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ if(NOT DEFINED CUDA_LIBS_DIR AND NOT DEFINED CUDA_INCLUDE)
endif()
endif()

find_package(hip HINTS ENV ROCM_PATH "/opt/rocm")
if(hip_FOUND)
set(HIP_LIBS_DIR "${hip_LIB_INSTALL_DIR}")
set(HIP_INCLUDE "${hip_INCLUDE_DIRS}")
endif()

if(SYCL_TEST_E2E_STANDALONE)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in"
"${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py")
Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/EnqueueNativeCommand/custom-command-hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
// RUN: %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// REQUIRES: target-amd

Expand Down
8 changes: 2 additions & 6 deletions sycl/test-e2e/Graph/NativeCommand/hip_explicit_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// FIXME: the rocm include path and link path are highly platform dependent,
// we should set this with some variable instead.
// https://github.com/intel/llvm/issues/17018

// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64 %}
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

Expand Down
8 changes: 2 additions & 6 deletions sycl/test-e2e/Graph/NativeCommand/hip_record_buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// FIXME: the rocm include path and link path are highly platform dependent,
// we should set this with some variable instead.
// https://github.com/intel/llvm/issues/17018

// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64 %}
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

Expand Down
8 changes: 2 additions & 6 deletions sycl/test-e2e/Graph/NativeCommand/hip_record_usm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
// FIXME: the rocm include path and link path are highly platform dependent,
// we should set this with some variable instead.
// https://github.com/intel/llvm/issues/17018

// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
// RUN: %{run-aux} %{build} -Wno-error=deprecated-pragma -o %t.out %hip_options
// RUN: %{run} %t.out
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64 %}
// RUN: %if preview-breaking-changes-supported %{ %{run-aux} %{build} -Wno-error=deprecated-pragma -fpreview-breaking-changes -o %t2.out %hip_options %}
// RUN: %if preview-breaking-changes-supported %{ %{run} %t2.out %}
// REQUIRES: target-amd

Expand Down
2 changes: 1 addition & 1 deletion sycl/test-e2e/HostInteropTask/interop-task-hip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// RUN: %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out -I%rocm_path/include -L%rocm_path/lib -lamdhip64
// RUN: %{build} -Wno-error=deprecated-pragma -Wno-error=deprecated-declarations -o %t.out %hip_options
// RUN: %{run} %t.out
// REQUIRES: target-amd

Expand Down
8 changes: 8 additions & 0 deletions sycl/test-e2e/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ at the full path specified by this variable.

***CUDA_LIBS_DIR*** - path to CUDA libraries (autodetected).

***HIP_INCLUDE*** - path to HIP headers (autodetected).

***HIP_LIBS_DIR*** - path to HIP libraries (autodetected).

***AMD_ARCH*** - flag may be set for when using HIP AMD triple. For example it
may be set to "gfx906". Otherwise must be provided via the ***amd_arch*** LIT
parameter (e.g., ***--param amd_arch=gfx906***) at runtime via the command line
Expand Down Expand Up @@ -297,6 +301,10 @@ configure specific single test execution in the command line:
CMake variable CUDA_INCLUDE (autodetected).
* **cuda_libs_dir** - directory containing CUDA SDK libraries, can be also set
by CMake variable CUDA_LIBS_DIR (autodetected).
* **hip_include** - directory containing HIP SDK headers, can be also set by
CMake variable HIP_INCLUDE (autodetected).
* **hip_libs_dir** - directory containing HIP SDK libraries, can be also set
by CMake variable HIP_LIBS_DIR (autodetected).
* **run_launcher** - part of `%{run*}` expansion/substitution to alter execution
of the test by, e.g., running it through Valgrind.

Expand Down
54 changes: 47 additions & 7 deletions sycl/test-e2e/lit.cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,53 @@ def open_check_file(file_name):
else:
config.substitutions.append(("%cuda_options", ""))

# Check for HIP SDK
check_hip_file = "hip_include.cpp"
with open_check_file(check_hip_file) as fp:
print(
textwrap.dedent(
"""
#define __HIP_PLATFORM_AMD__ 1
#include <hip/hip_runtime.h>
int main() { hipError_t r = hipInit(0); return r; }
"""
),
file=fp,
)
config.hip_libs_dir = lit_config.params.get("hip_libs_dir", config.hip_libs_dir)
config.hip_include = lit_config.params.get(
"hip_include",
(config.hip_include if config.hip_include else config.sycl_include),
)

hip_options = hip_options = (
(" -L" + config.hip_libs_dir if config.hip_libs_dir else "")
+ " -lamdhip64 "
+ " -I"
+ config.hip_include
)
if cl_options:
hip_options = (
" "
+ (
config.hip_libs_dir + "/amdhip64.lib "
if config.hip_libs_dir
else "amdhip64.lib"
)
+ " /I"
+ config.hip_include
)

with test_env():
sp = subprocess.getstatusoutput(
config.dpcpp_compiler + " -fsycl " + check_hip_file + hip_options
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need -fsycl here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

probably not but i just copied what we did for cuda, i can remove it from both if you think thats better

Copy link
Contributor

Choose a reason for hiding this comment

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

No difference to me at all.

)
if sp[0] == 0:
config.available_features.add("hip_dev_kit")
config.substitutions.append(("%hip_options", hip_options))
else:
config.substitutions.append(("%hip_options", ""))

# Check for OpenCL ICD
if config.opencl_libs_dir:
if cl_options:
Expand Down Expand Up @@ -585,13 +632,6 @@ def remove_level_zero_suffix(devices):
if be not in available_devices or dev not in available_devices[be]:
lit_config.error("Unsupported device {}".format(d))

# Set ROCM_PATH to help clang find the HIP installation.
if "target-amd" in config.sycl_build_targets:
llvm_config.with_system_environment("ROCM_PATH")
config.substitutions.append(
("%rocm_path", os.environ.get("ROCM_PATH", "/opt/rocm"))
)

if "cuda:gpu" in config.sycl_devices:
if "CUDA_PATH" not in os.environ:
if platform.system() == "Windows":
Expand Down
2 changes: 2 additions & 0 deletions sycl/test-e2e/lit.site.cfg.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ config.level_zero_libs_dir = "@LEVEL_ZERO_LIBS_DIR@"
config.level_zero_include = "@LEVEL_ZERO_INCLUDE@"
config.cuda_libs_dir = "@CUDA_LIBS_DIR@"
config.cuda_include = "@CUDA_INCLUDE@"
config.hip_libs_dir = "@HIP_LIBS_DIR@"
config.hip_include = "@HIP_INCLUDE@"

config.opencl_include_dir = os.path.join(config.sycl_include, 'sycl')

Expand Down