From 5ff790eb05db6ef82171f233542e6cced5a94625 Mon Sep 17 00:00:00 2001
From: Kiefer van Teutem <50830967+krithalith@users.noreply.github.com>
Date: Wed, 18 Jun 2025 04:29:09 +0200
Subject: [PATCH] Fix argument order for calls to profile_batched_gemm_impl()
 (#2277)

* Fix argument order for calls to profile_batched_gemm_impl()

* Revert previous and swap the order of the profile_batched_gemm_impl() function arguments instead.

* Revert copyright years for unchanged files.

* Remove test_batched_gemm from REGRESSION_TESTS since it no longer takes more than 30 seconds to run.

---------

Co-authored-by: Kiefer van Teutem <kiefer.van.teutem@streamhpc.com>

[ROCm/composable_kernel commit: c7c6a0ccb37063835686121fdd8a67112c930d02]
---
 profiler/include/profiler/profile_batched_gemm_impl.hpp | 8 ++++----
 profiler/src/profile_batched_gemm.cpp                   | 8 ++++----
 profiler/src/profile_batched_gemm_multi_d.cpp           | 8 ++++----
 test/CMakeLists.txt                                     | 1 -
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/profiler/include/profiler/profile_batched_gemm_impl.hpp b/profiler/include/profiler/profile_batched_gemm_impl.hpp
index 936c22f5d8..92e06e4a70 100644
--- a/profiler/include/profiler/profile_batched_gemm_impl.hpp
+++ b/profiler/include/profiler/profile_batched_gemm_impl.hpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2018-2023, Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2018-2025, Advanced Micro Devices, Inc. All rights reserved.
 
 #pragma once
 
@@ -41,12 +41,12 @@ bool profile_batched_gemm_impl(int do_verification,
                                int M,
                                int N,
                                int K,
-                               int BatchStrideA,
-                               int BatchStrideB,
-                               int BatchStrideC,
                                int StrideA,
                                int StrideB,
                                int StrideC,
+                               int BatchStrideA,
+                               int BatchStrideB,
+                               int BatchStrideC,
                                int BatchCount)
 {
     bool pass = true;
diff --git a/profiler/src/profile_batched_gemm.cpp b/profiler/src/profile_batched_gemm.cpp
index 222532b7bb..d9da68b050 100644
--- a/profiler/src/profile_batched_gemm.cpp
+++ b/profiler/src/profile_batched_gemm.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2018-2023, Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2018-2025, Advanced Micro Devices, Inc. All rights reserved.
 
 #include <cstdint>
 #include <iostream>
@@ -136,12 +136,12 @@ int profile_batched_gemm(int argc, char* argv[])
                                                                           M,
                                                                           N,
                                                                           K,
-                                                                          BatchStrideA_,
-                                                                          BatchStrideB_,
-                                                                          BatchStrideC_,
                                                                           StrideA_,
                                                                           StrideB_,
                                                                           StrideC_,
+                                                                          BatchStrideA_,
+                                                                          BatchStrideB_,
+                                                                          BatchStrideC_,
                                                                           BatchCount);
 
             return pass ? 0 : 1;
diff --git a/profiler/src/profile_batched_gemm_multi_d.cpp b/profiler/src/profile_batched_gemm_multi_d.cpp
index 7cd4636d98..eb94c07900 100644
--- a/profiler/src/profile_batched_gemm_multi_d.cpp
+++ b/profiler/src/profile_batched_gemm_multi_d.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-// Copyright (c) 2018-2023, Advanced Micro Devices, Inc. All rights reserved.
+// Copyright (c) 2018-2025, Advanced Micro Devices, Inc. All rights reserved.
 
 #include <cstdint>
 #include <iostream>
@@ -138,12 +138,12 @@ int profile_batched_gemm_multi_d(int argc, char* argv[])
                                                                           M,
                                                                           N,
                                                                           K,
-                                                                          BatchStrideA_,
-                                                                          BatchStrideB_,
-                                                                          BatchStrideC_,
                                                                           StrideA_,
                                                                           StrideB_,
                                                                           StrideC_,
+                                                                          BatchStrideA_,
+                                                                          BatchStrideB_,
+                                                                          BatchStrideC_,
                                                                           BatchCount);
 
             return pass ? 0 : 1;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5b25550d9b..1be7c88c2e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,7 +13,6 @@ set(REGRESSION_TESTS
     test_gemm_standalone_xdl_fp16
     test_gemm_fp16
     test_gemm_splitk
-    test_batched_gemm
     test_gemm_universal_wmma_fp16
     test_gemm_universal_xdl_fp16
     test_gemm_universal_streamk_fp16