From 6bab3343ec190514f7ba4664a3e997a06370bb72 Mon Sep 17 00:00:00 2001
From: Chen Weihang <chenweihang@baidu.com>
Date: Tue, 8 Nov 2022 10:29:46 +0800
Subject: [PATCH] normalize autotune tests dir (#47726)

---
 paddle/phi/kernels/autotune/CMakeLists.txt    | 25 -------------------
 paddle/phi/tests/kernels/CMakeLists.txt       | 25 +++++++++++++++++++
 .../kernels/test_auto_tune.cu}                |  0
 .../kernels/test_cache.cc}                    |  4 +--
 .../kernels/test_gpu_timer.cu}                |  0
 5 files changed, 27 insertions(+), 27 deletions(-)
 rename paddle/phi/{kernels/autotune/auto_tune_test.cu => tests/kernels/test_auto_tune.cu} (100%)
 rename paddle/phi/{kernels/autotune/cache_test.cc => tests/kernels/test_cache.cc} (100%)
 rename paddle/phi/{kernels/autotune/gpu_timer_test.cu => tests/kernels/test_gpu_timer.cu} (100%)

diff --git a/paddle/phi/kernels/autotune/CMakeLists.txt b/paddle/phi/kernels/autotune/CMakeLists.txt
index 9379c78c8d..33c10e7f48 100644
--- a/paddle/phi/kernels/autotune/CMakeLists.txt
+++ b/paddle/phi/kernels/autotune/CMakeLists.txt
@@ -1,30 +1,5 @@
-if(WITH_GPU)
-  nv_test(
-    gpu_timer_test
-    SRCS gpu_timer_test.cu
-    DEPS gtest)
-  nv_test(
-    auto_tune_test
-    SRCS auto_tune_test.cu
-    DEPS gtest)
-elseif(WITH_ROCM)
-  hip_test(
-    gpu_timer_test
-    SRCS gpu_timer_test.cu
-    DEPS gtest)
-  hip_test(
-    auto_tune_test
-    SRCS auto_tune_test.cu
-    DEPS gtest)
-endif()
-
 cc_library(cache SRCS cache.cc)
 cc_library(
   switch_autotune
   SRCS switch_autotune.cc
   DEPS cache flags)
-
-cc_test(
-  cache_test
-  SRCS cache_test.cc
-  DEPS gtest cache)
diff --git a/paddle/phi/tests/kernels/CMakeLists.txt b/paddle/phi/tests/kernels/CMakeLists.txt
index da4aca8535..ed79b26d1c 100644
--- a/paddle/phi/tests/kernels/CMakeLists.txt
+++ b/paddle/phi/tests/kernels/CMakeLists.txt
@@ -66,3 +66,28 @@ cc_test(
   test_transfer_layout_dev_api
   SRCS test_transfer_layout_dev_api.cc
   DEPS phi phi_api_utils)
+
+if(WITH_GPU)
+  nv_test(
+    test_gpu_timer
+    SRCS test_gpu_timer.cu
+    DEPS gtest)
+  nv_test(
+    test_auto_tune
+    SRCS test_auto_tune.cu
+    DEPS gtest)
+elseif(WITH_ROCM)
+  hip_test(
+    test_gpu_timer
+    SRCS test_gpu_timer.cu
+    DEPS gtest)
+  hip_test(
+    test_auto_tune
+    SRCS test_auto_tune.cu
+    DEPS gtest)
+endif()
+
+cc_test(
+  test_cache
+  SRCS test_cache.cc
+  DEPS gtest cache)
diff --git a/paddle/phi/kernels/autotune/auto_tune_test.cu b/paddle/phi/tests/kernels/test_auto_tune.cu
similarity index 100%
rename from paddle/phi/kernels/autotune/auto_tune_test.cu
rename to paddle/phi/tests/kernels/test_auto_tune.cu
diff --git a/paddle/phi/kernels/autotune/cache_test.cc b/paddle/phi/tests/kernels/test_cache.cc
similarity index 100%
rename from paddle/phi/kernels/autotune/cache_test.cc
rename to paddle/phi/tests/kernels/test_cache.cc
index 18454ad3e1..3dcd1b4eba 100644
--- a/paddle/phi/kernels/autotune/cache_test.cc
+++ b/paddle/phi/tests/kernels/test_cache.cc
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "paddle/phi/kernels/autotune/cache.h"
-
 #include <gtest/gtest.h>
 
 #include <cmath>
 #include <functional>
 
+#include "paddle/phi/kernels/autotune/cache.h"
+
 #include "glog/logging.h"
 
 enum ConvAlgos { GEMMKernel = 0, CuDNNKernel_1 = 1, CuDNNKernel_2 = 2 };
diff --git a/paddle/phi/kernels/autotune/gpu_timer_test.cu b/paddle/phi/tests/kernels/test_gpu_timer.cu
similarity index 100%
rename from paddle/phi/kernels/autotune/gpu_timer_test.cu
rename to paddle/phi/tests/kernels/test_gpu_timer.cu
-- 
GitLab