From 2dabd450c18e2ff9752e0f77becb002150effca9 Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Wed, 19 Nov 2025 18:05:25 +0100 Subject: [PATCH] [CK_BUILDER] fixes (#3222) * ck-builder: some miscellaneous fixes * ck-builder: fix InstanceSet.FromFactory test The exact syntax that the instance string functionality returns has changed. This commit updates the test to expect the right string. [ROCm/composable_kernel commit: 7fe7aa76f52ad7bdb0bb08c1f2d1de468cc8c070] --- ..._device_grouped_conv_fwd_multiple_abd_xdl_cshuffle.hpp | 1 + ...uped_conv_fwd_multiple_d_xdl_large_tensor_cshuffle.hpp | 1 + experimental/builder/test/conv/test_conv_traits.cpp | 2 +- experimental/builder/test/test_testing_utils.cpp | 8 ++++---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_abd_xdl_cshuffle.hpp b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_abd_xdl_cshuffle.hpp index 572b04e75b..982eff2cb0 100644 --- a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_abd_xdl_cshuffle.hpp +++ b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_abd_xdl_cshuffle.hpp @@ -14,6 +14,7 @@ #pragma once #include "instance_traits.hpp" +#include "instance_traits_util.hpp" // Forward declaration to avoid circular dependency. namespace ck::tensor_operation::device { diff --git a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_d_xdl_large_tensor_cshuffle.hpp b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_d_xdl_large_tensor_cshuffle.hpp index f60d5e7b68..3fe89899ba 100644 --- a/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_d_xdl_large_tensor_cshuffle.hpp +++ b/experimental/builder/include/ck_tile/builder/reflect/instance_traits_device_grouped_conv_fwd_multiple_d_xdl_large_tensor_cshuffle.hpp @@ -14,6 +14,7 @@ #pragma once #include "instance_traits.hpp" +#include "instance_traits_util.hpp" // Forward declaration to avoid circular dependency. namespace ck::tensor_operation::device { diff --git a/experimental/builder/test/conv/test_conv_traits.cpp b/experimental/builder/test/conv/test_conv_traits.cpp index b666db0836..9a831ca7dd 100644 --- a/experimental/builder/test/conv/test_conv_traits.cpp +++ b/experimental/builder/test/conv/test_conv_traits.cpp @@ -74,7 +74,7 @@ TEST_F(ConvTraitsTest, ConvFwdTraitsExtraction) 8>, // CDEBlockTransferClusterLengths_MBlock_MPerBlock_NBlock_NPerBlock 8, // CDEBlockTransferScalarPerVector_NPerBlock ck::BlockGemmPipelineScheduler::Intrawave, // BlkGemmPipeSched - ck::PipelineVersion::v1, // BlkGemmPipelineVer + ck::BlockGemmPipelineVersion::v1, // BlkGemmPipelineVer ck::half_t, // AComputeDataType ck::half_t, // BComputeDataType false>; // DirectLoad diff --git a/experimental/builder/test/test_testing_utils.cpp b/experimental/builder/test/test_testing_utils.cpp index 89d8c06e59..efd71b9f86 100644 --- a/experimental/builder/test/test_testing_utils.cpp +++ b/experimental/builder/test/test_testing_utils.cpp @@ -32,10 +32,10 @@ TEST(InstanceSet, FromFactory) EXPECT_THAT(instances.instances.size(), testing::Gt(0)); const auto* el = - "DeviceGroupedConvFwdMultipleABD_Xdl_CShuffle_V3<2,NHWGC,GKYXC,EmptyTuple,NHWGK,fp16,fp16," - "fp32,fp16,EmptyTuple,fp16,PassThrough,PassThrough,PassThrough,OddC,MNKPadding,64,16,16,64," - "8,8,16,16,1,1,Seq(8,8,1),Seq(1,0,2),Seq(1,0,2),2,8,8,0,Seq(8,8,1),Seq(1,0,2),Seq(1,0,2),2," - "8,8,0,1,1,Seq(1,16,1,4),4,Intrawave,v2,fp16,fp16>"; + "DeviceGroupedConvFwdMultipleABD_Xdl_CShuffle<2,NHWGC,GKYXC,EmptyTuple,NHWGK,fp16,fp16," + "fp32,fp16,EmptyTuple,fp16,PassThrough,PassThrough,PassThrough,Default,MNKPadding,1,128," + "128,128,32,8,8,32,32,4,2,Seq(4,32,1),Seq(1,0,2),Seq(1,0,2),2,8,8,1,Seq(4,32,1),Seq(1,0,2)," + "Seq(1,0,2),2,8,8,1,1,1,Seq(1,16,1,8),8,fp16,fp16,Default,1>"; EXPECT_THAT(instances.instances, testing::Contains(el)); }