ROCm/composable_kernel
1
0
Fork 0
mirror of https://github.com/ROCm/composable_kernel.git synced 2026-07-10 17:17:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test compilation error + removed dup introducing during merging

Browse Source
This commit is contained in:
Damien Lejeune
2025-08-01 15:09:43 +00:00
parent 4740aebc2b
commit 199d701fde
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/ck_tile/gemm/test_gemm_pipeline_kernel_types.hpp
View File

@@ -86,9 +86,4 @@ using KernelTypesPersistent = ::testing::Types<
std::tuple< Row, Col, Row, F16, F16, F32, F16, Intrawave, CompV3, NonPersistent>
>;
using KernelTypesPersistent = ::testing::Types<
std::tuple< Row, Col, Row, F16, F16, F32, F16, Intrawave, CompV3, Persistent>,
std::tuple< Row, Col, Row, F16, F16, F32, F16, Intrawave, CompV3, NonPersistent>
>;
// clang-format on

27
test/ck_tile/gemm/test_gemm_pipeline_util.hpp
View File

@@ -83,15 +83,17 @@ class TestCkTileGemmPipeline : public ::testing::Test
static constexpr auto Scheduler = std::tuple_element_t<7, Tuple>::value;
static constexpr auto PipelineType = std::tuple_element_t<8, Tuple>::value;
static constexpr bool Persistent = (PipelineType == GemmPipelineType::CompV3)
? std::tuple_element_t<9, Tuple>::value
: std::false_type::value;
static constexpr bool SkipALds = (PipelineType == GemmPipelineType::Mem)
? std::tuple_element_t<9, Tuple>::value
: std::false_type::value;
static constexpr bool SkipBLds = (PipelineType == GemmPipelineType::Mem)
? std::tuple_element_t<10, Tuple>::value
: std::false_type::value;
static constexpr bool Persistent = std::conditional_t<PipelineType == GemmPipelineType::CompV3,
std::tuple_element_t<9, Tuple>,
std::false_type>::value;
static constexpr bool SkipALds = std::conditional_t<PipelineType == GemmPipelineType::Mem,
std::tuple_element_t<9, Tuple>,
std::false_type>::value;
static constexpr bool SkipBLds = std::conditional_t<PipelineType == GemmPipelineType::Mem,
std::tuple_element_t<10, Tuple>,
std::false_type>::value;
using DsLayout = ck_tile::tuple<>;
using DsDataType = ck_tile::tuple<>;
@@ -121,9 +123,6 @@ class TestCkTileGemmPipeline : public ::testing::Test
constexpr bool DoubleSmemBuffer = (PipelineType == GemmPipelineType::CompV4) ? true : false;
constexpr bool kSkipALds = SkipALds;
constexpr bool kSkipBLds = SkipBLds;
// TODO: For now - but this should also be a test parameter
constexpr bool TransposeC = false;
@@ -156,8 +155,8 @@ class TestCkTileGemmPipeline : public ::testing::Test
Persistent,
NumWaveGroup,
preshuffle,
kSkipALds,
kSkipBLds>;
SkipALds,
SkipBLds>;
using GemmPipelineProblem =
ck_tile::GemmPipelineProblem<ADataType, BDataType, AccDataType, GemmShape, Traits>;