Skip to content

Commit 7a7c381

Browse files
authored
Change cutlass-sycl name to sycl-tla (#277)
1 parent 91926a3 commit 7a7c381

7 files changed

Lines changed: 30 additions & 30 deletions

File tree

build2cmake/src/config/deps.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ pub enum Dependency {
2525
Cutlass3_9,
2626
#[serde(rename = "cutlass_4_0")]
2727
Cutlass4_0,
28-
#[serde(rename = "cutlass_sycl")]
29-
CutlassSycl,
28+
#[serde(rename = "sycl_tla")]
29+
SyclTla,
3030
#[serde(rename = "metal-cpp")]
3131
MetalCpp,
3232
Torch,

build2cmake/src/templates/xpu/dep-cutlass-sycl.cmake renamed to build2cmake/src/templates/xpu/dep-sycl-tla.cmake

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
if(GPU_LANG STREQUAL "SYCL")
22

3-
find_package(CutlassSycl)
3+
find_package(SyclTla)
44

55
if(DPCPP_VERSION STREQUAL "2025.3")
6-
set(CUTLASS_SYCL_REVISION "14055e78510b8776ba739755eb57e592fdceefdb" CACHE STRING "CUTLASS revision to use")
6+
set(SYCL_TLA_REVISION "14055e78510b8776ba739755eb57e592fdceefdb" CACHE STRING "CUTLASS revision to use")
77
elseif(DPCPP_VERSION STREQUAL "2025.2")
8-
set(CUTLASS_SYCL_REVISION "14055e78510b8776ba739755eb57e592fdceefdb" CACHE STRING "CUTLASS revision to use")
8+
set(SYCL_TLA_REVISION "14055e78510b8776ba739755eb57e592fdceefdb" CACHE STRING "CUTLASS revision to use")
99
elseif(DPCPP_VERSION STREQUAL "2025.1")
10-
set(CUTLASS_SYCL_REVISION "v3.9-0.3" CACHE STRING "CUTLASS revision to use")
10+
set(SYCL_TLA_REVISION "v3.9-0.3" CACHE STRING "CUTLASS revision to use")
1111
elseif(DPCPP_VERSION STREQUAL "2025.0")
12-
set(CUTLASS_SYCL_REVISION "v3.9-0.2" CACHE STRING "CUTLASS revision to use")
12+
set(SYCL_TLA_REVISION "v3.9-0.2" CACHE STRING "CUTLASS revision to use")
1313
else()
1414
message(FATAL_ERROR "Unknown DPCPP_VERSION: ${DPCPP_VERSION}")
1515
endif()
1616

17-
if (NOT CutlassSycl_FOUND)
17+
if (NOT SyclTla_FOUND)
1818
set(CUTLASS_ENABLE_HEADERS_ONLY ON CACHE BOOL "Enable only the header library")
1919
set(CUTLASS_ENABLE_BENCHMARKS OFF CACHE BOOL "Disable CUTLASS Benchmarks")
20-
# Use the specified CUTLASS source directory for compilation if CUTLASS_SYCL_SRC_DIR is provided
21-
if (DEFINED ENV{CUTLASS_SYCL_SRC_DIR})
22-
set(CUTLASS_SYCL_SRC_DIR $ENV{CUTLASS_SYCL_SRC_DIR})
20+
# Use the specified CUTLASS source directory for compilation if SYCL_TLA_SRC_DIR is provided
21+
if (DEFINED ENV{SYCL_TLA_SRC_DIR})
22+
set(SYCL_TLA_SRC_DIR $ENV{SYCL_TLA_SRC_DIR})
2323
endif()
2424

25-
if(CUTLASS_SYCL_SRC_DIR)
26-
if(NOT IS_ABSOLUTE CUTLASS_SYCL_SRC_DIR)
27-
get_filename_component(CUTLASS_SYCL_SRC_DIR "${CUTLASS_SYCL_SRC_DIR}" ABSOLUTE)
25+
if(SYCL_TLA_SRC_DIR)
26+
if(NOT IS_ABSOLUTE SYCL_TLA_SRC_DIR)
27+
get_filename_component(SYCL_TLA_SRC_DIR "${SYCL_TLA_SRC_DIR}" ABSOLUTE)
2828
endif()
29-
message(STATUS "The CUTLASS_SYCL_SRC_DIR is set, using ${CUTLASS_SYCL_SRC_DIR} for compilation")
30-
FetchContent_Declare(cutlass SOURCE_DIR ${CUTLASS_SYCL_SRC_DIR})
29+
message(STATUS "The SYCL_TLA_SRC_DIR is set, using ${SYCL_TLA_SRC_DIR} for compilation")
30+
FetchContent_Declare(cutlass SOURCE_DIR ${SYCL_TLA_SRC_DIR})
3131
else()
3232
# Speed up CUTLASS download by retrieving only the specified GIT_TAG instead of the history.
3333
# Important: If GIT_SHALLOW is enabled then GIT_TAG works only with branch names and tags.
3434
# So if the GIT_TAG above is updated to a commit hash, GIT_SHALLOW must be set to FALSE
35-
if(CUTLASS_SYCL_REVISION MATCHES "^v")
35+
if(SYCL_TLA_REVISION MATCHES "^v")
3636
set(CUTLASS_GIT_SHALLOW TRUE)
3737
else()
3838
set(CUTLASS_GIT_SHALLOW FALSE)
3939
endif()
4040
FetchContent_Declare(
4141
cutlass
4242
GIT_REPOSITORY https://github.com/intel/sycl-tla.git
43-
GIT_TAG ${CUTLASS_SYCL_REVISION}
43+
GIT_TAG ${SYCL_TLA_REVISION}
4444
GIT_PROGRESS TRUE
4545
GIT_SHALLOW ${CUTLASS_GIT_SHALLOW}
4646
)
4747
endif()
4848

4949
# Set Intel backend env
50-
message(STATUS "Setting Intel GPU optimization env vars for Cutlass-SYCL")
50+
message(STATUS "Setting Intel GPU optimization env vars for sycl-tla")
5151
set(CUTLASS_ENABLE_SYCL ON CACHE BOOL "Enable SYCL for CUTLASS")
5252
add_compile_definitions(CUTLASS_ENABLE_SYCL=1)
5353
set(DPCPP_SYCL_TARGET "intel_gpu_bmg_g21,intel_gpu_pvc" CACHE STRING "SYCL target for Intel GPU")
@@ -67,15 +67,15 @@ if (NOT CutlassSycl_FOUND)
6767
else()
6868
include_directories(${CUTLASS_INCLUDE_DIR})
6969
include_directories(${CUTLASS_TOOLS_UTIL_INCLUDE_DIR})
70-
endif(NOT CutlassSycl_FOUND)
71-
if(CUTLASS_SYCL_REVISION MATCHES "^v3\\.9")
70+
endif(NOT SyclTla_FOUND)
71+
if(SYCL_TLA_REVISION MATCHES "^v3\\.9")
7272
add_compile_definitions(OLD_API=1)
7373
endif()
7474

7575
string(REPLACE "-fsycl-targets=spir64_gen,spir64" "-fsycl-targets=spir64" sycl_link_flags "${sycl_link_flags}")
7676
string(REPLACE "-device pvc,xe-lpg,ats-m150" "-device bmg_g21,pvc" sycl_link_flags "${sycl_link_flags}")
7777
string(APPEND sycl_link_flags "-Xspirv-translator;-spirv-ext=+SPV_INTEL_split_barrier")
78-
if(DPCPP_VERSION STREQUAL "2025.2" OR DPCPP_VERSION STREQUAL "2025.3" OR CUTLASS_SYCL_REVISION STREQUAL "v0.5")
78+
if(DPCPP_VERSION STREQUAL "2025.2" OR DPCPP_VERSION STREQUAL "2025.3" OR SYCL_TLA_REVISION STREQUAL "v0.5")
7979
string(APPEND sycl_link_flags ",+SPV_INTEL_2d_block_io,+SPV_INTEL_subgroup_matrix_multiply_accumulate")
8080
endif()
8181
string(REPLACE "-fsycl-targets=spir64_gen,spir64" "-fsycl-targets=spir64" sycl_flags "${sycl_flags}")

build2cmake/src/torch/deps.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ pub fn render_deps(env: &Environment, build: &Build, write: &mut impl Write) ->
8181
)
8282
.wrap_err("Cannot render CUTLASS dependency template")?;
8383
}
84-
Dependency::CutlassSycl => {
85-
env.get_template("xpu/dep-cutlass-sycl.cmake")?
84+
Dependency::SyclTla => {
85+
env.get_template("xpu/dep-sycl-tla.cmake")?
8686
.render_to_write(context! {}, &mut *write)?;
8787
}
8888
Dependency::MetalCpp => {

builder/examples/cutlass-gemm/build.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ src = ["gemm.cu"]
2323
backend = "xpu"
2424
depends = [
2525
"torch",
26-
"cutlass_sycl",
26+
"sycl_tla",
2727
]
2828
src = ["gemm_sycl.cpp"]
2929

builder/lib/deps.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let
2727
"torch" = [
2828
torch
2929
];
30-
"cutlass_sycl" = [ torch.xpuPackages.cutlass-sycl ];
30+
"sycl_tla" = [ torch.xpuPackages.sycl-tla ];
3131
"metal-cpp" = [
3232
pkgs.metal-cpp.dev
3333
];

nix/pkgs/xpu-packages/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ let
2929
ocloc = final.callPackage ./ocloc.nix { };
3030
})
3131
(final: prev: {
32-
cutlass-sycl = final.callPackage ./cutlass-sycl.nix { };
32+
sycl-tla = final.callPackage ./sycl-tla.nix { };
3333
})
3434
];
3535
in
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let
3434
in
3535

3636
stdenv.mkDerivation rec {
37-
pname = "cutlass-sycl";
37+
pname = "sycl-tla";
3838
inherit (cutlassVersion) version;
3939

4040
src = fetchFromGitHub (
@@ -73,10 +73,10 @@ stdenv.mkDerivation rec {
7373
];
7474

7575
installPhase = ''
76-
mkdir -p $out/lib $out/include $out/tools/util/include $out/lib/cmake/CutlassSycl
76+
mkdir -p $out/lib $out/include $out/tools/util/include $out/lib/cmake/SyclTla
7777
cp -rn $src/include/* $out/include/
7878
cp -rn $src/tools/util/include/* $out/tools/util/include/
79-
cat > $out/lib/cmake/CutlassSycl/CutlassSyclConfig.cmake <<EOF
79+
cat > $out/lib/cmake/SyclTla/SyclTlaConfig.cmake <<EOF
8080
set(CUTLASS_INCLUDE_DIR "$out/include")
8181
set(CUTLASS_TOOLS_UTIL_INCLUDE_DIR "$out/tools/util/include")
8282
add_compile_definitions(CUTLASS_ENABLE_SYCL)

0 commit comments

Comments
 (0)