Update sycl-tla tag

Author: YangKai0616

build2cmake/src/templates/xpu/dep-cutlass-sycl.cmake

@@ -1,7 +1,8 @@
 find_package(CutlassSycl)
 
 if(DPCPP_VERSION STREQUAL "2025.2")
-  set(CUTLASS_SYCL_REVISION "v0.6" CACHE STRING "CUTLASS revision to use")
+  # TODO revert v0.5
+  set(CUTLASS_SYCL_REVISION "14055e78510b8776ba739755eb57e592fdceefdb" CACHE STRING "CUTLASS revision to use")
 elseif(DPCPP_VERSION STREQUAL "2025.1")
   set(CUTLASS_SYCL_REVISION "v3.9-0.3" CACHE STRING "CUTLASS revision to use")
 elseif(DPCPP_VERSION STREQUAL "2025.0")
@@ -27,14 +28,15 @@ if (NOT CutlassSycl_FOUND)
   else()
     FetchContent_Declare(
         cutlass
-        GIT_REPOSITORY https://github.com/intel/cutlass-sycl.git
+        GIT_REPOSITORY https://github.com/intel/sycl-tla.git
         GIT_TAG ${CUTLASS_SYCL_REVISION}
         GIT_PROGRESS TRUE
 
         # Speed up CUTLASS download by retrieving only the specified GIT_TAG instead of the history.
         # Important: If GIT_SHALLOW is enabled then GIT_TAG works only with branch names and tags.
         # So if the GIT_TAG above is updated to a commit hash, GIT_SHALLOW must be set to FALSE
-        GIT_SHALLOW TRUE
+        # TODO For 2025.2 FA2, we use a commit hash, so GIT_SHALLOW must be FALSE
+        GIT_SHALLOW $<IF:$<STREQUAL:${DPCPP_VERSION},2025.2>,FALSE,TRUE>
     )
   endif()
 
@@ -64,12 +66,23 @@ if(CUTLASS_SYCL_REVISION MATCHES "^v3\\.9")
   add_compile_definitions(OLD_API=1)
 endif()
 
-string(REGEX REPLACE "^v" "" CUTLASS_VER_NO_V "${CUTLASS_SYCL_REVISION}")
-if(CUTLASS_VER_NO_V VERSION_LESS "0.6" OR CUTLASS_VER_NO_V MATCHES "^3\\.")
+# TODO Determine which flash attention implementation to use
+if(CUTLASS_SYCL_REVISION MATCHES "^[0-9a-f]{40}$")
+  # Commit hash - assume newer version
+  set(USE_OLD_FLASH_ATTN OFF)
+elseif(CUTLASS_SYCL_REVISION MATCHES "^v3\\.")
+  # v3.x versions use old implementation
   add_compile_definitions(USE_OLD_FLASH_ATTN=1)
   set(USE_OLD_FLASH_ATTN ON)
 else()
-  set(USE_OLD_FLASH_ATTN OFF)
+  # Tag versions - check version number
+  string(REGEX REPLACE "^v" "" CUTLASS_VER_NO_V "${CUTLASS_SYCL_REVISION}")
+  if(CUTLASS_VER_NO_V VERSION_LESS "0.6")
+    add_compile_definitions(USE_OLD_FLASH_ATTN=1)
+    set(USE_OLD_FLASH_ATTN ON)
+  else()
+    set(USE_OLD_FLASH_ATTN OFF)
+  endif()
 endif()
 
 string(REPLACE "-fsycl-targets=spir64_gen,spir64" "-fsycl-targets=spir64" sycl_link_flags "${sycl_link_flags}")

pkgs/xpu-packages/cutlass-sycl.nix

@@ -15,11 +15,14 @@ let
   cutlassVersions = {
     "2025.1" = {
       version = "3.9-0.3";
+      useTag = true;
       hash = "sha256-FLmTseMw31txptQkvWaN03xoaLzIbQz2Ip1xtCKH3ZE=";
     };
     "2025.2" = {
-      version = "0.5";
-      hash = "sha256-IgsPsREGPqtko6qVyVmDyI1CAGn46fqu1clL8UHltno=";
+      version = "0.6-dev";
+      # TODO Use latest commit from main branch for FA2 newer features
+      rev = "14055e78510b8776ba739755eb57e592fdceefdb";
+      hash = "sha256-5KVvFdEYFQhvIjeauoEUSyhBdbSh6UYEwgsd+X7jcHA=";
     };
   };
   cutlassVersion =
@@ -33,8 +36,12 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "intel";
-    repo = "cutlass-sycl";
-    tag = "v${cutlassVersion.version}";
+    repo = "sycl-tla";
+    # TODO Use tag for releases, rev for development commits
+    ${if cutlassVersion ? useTag then "tag" else "rev"} = 
+      if cutlassVersion ? useTag 
+      then "v${cutlassVersion.version}" 
+      else cutlassVersion.rev;
     inherit (cutlassVersion) hash;
   };