From 7ac71212712655a3d8087a3299e7758cfacdbb54 Mon Sep 17 00:00:00 2001 From: Christian Sarofeen Date: Sat, 11 Jan 2025 13:26:27 -0800 Subject: [PATCH] Merge conflicts. --- tests/cpp/test_matmul.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cpp/test_matmul.cpp b/tests/cpp/test_matmul.cpp index 263297bda50..b9a12a36089 100644 --- a/tests/cpp/test_matmul.cpp +++ b/tests/cpp/test_matmul.cpp @@ -4291,10 +4291,10 @@ TEST_F(HopperMatmulTest, MLPBenchmarkFwdGEMM) { KernelExecutor ke; ke.compile(&fusion, inputs); - EXPECT_TRUE(getBankConflictInfo(ke.kernel()).empty()); + EXPECT_TRUE(getBankConflictInfo(ke.compiledKernel()->kernel()).empty()); auto cg_outputs = ke.run(inputs); - ASSERT_FALSE( - PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse(ke.kernel())); + ASSERT_FALSE(PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse( + ke.compiledKernel()->kernel())); // Relax tolerance for larger sum due to large K EXPECT_TRUE(cg_outputs[0].allclose(out_ref, 1e-6 * K, 1e-6 * K)); @@ -4362,10 +4362,10 @@ TEST_F(HopperMatmulTest, MLPBenchmarkFwdEpilogueFusion) { KernelExecutor ke; ke.compile(&fusion, inputs); - EXPECT_TRUE(getBankConflictInfo(ke.kernel()).empty()); + EXPECT_TRUE(getBankConflictInfo(ke.compiledKernel()->kernel()).empty()); auto cg_outputs = ke.run(inputs); - ASSERT_FALSE( - PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse(ke.kernel())); + ASSERT_FALSE(PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse( + ke.compiledKernel()->kernel())); // Relax tolerance for larger sum due to large K EXPECT_TRUE(cg_outputs[0].allclose(tv3_ref, 1e-6 * K, 1e-6 * K)); @@ -4443,10 +4443,10 @@ TEST_F(HopperMatmulTest, MLPBenchmarkFwdHorizontalFusion) { KernelExecutor ke; ke.compile(&fusion, inputs); - EXPECT_TRUE(getBankConflictInfo(ke.kernel()).empty()); + EXPECT_TRUE(getBankConflictInfo(ke.compiledKernel()->kernel()).empty()); auto cg_outputs = ke.run(inputs); - ASSERT_FALSE( - PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse(ke.kernel())); + ASSERT_FALSE(PredicatedChecker::isCpAsyncMmaPredicatedByIfThenElse( + ke.compiledKernel()->kernel())); // Relax tolerance for larger sum due to large K // TODO: Some of these are failing, perhaps due to improper syncing of