Merge conflicts.

NVIDIA · Jan 11, 2025 · 7ac7121 · 7ac7121
1 parent fb38b77
commit 7ac7121
Showing 1 changed file with 9 additions and 9 deletions.
diff --git 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