[What] Rename original layernorm into layernorm2d

[Why] Prepare to add groupnorm using layernorm5d

test/layernorm/CMakeLists.txt

 add_custom_target(test_layernorm)
 
-add_gtest_executable(test_layernorm_fp32 test_layernorm_fp32.cpp)
-add_gtest_executable(test_layernorm_fp16 test_layernorm_fp16.cpp)
+add_gtest_executable(test_layernorm2d_fp32 test_layernorm2d_fp32.cpp)
+add_gtest_executable(test_layernorm2d_fp16 test_layernorm2d_fp16.cpp)
 
-target_link_libraries(test_layernorm_fp32 PRIVATE utility)
-target_link_libraries(test_layernorm_fp16 PRIVATE utility)
+target_link_libraries(test_layernorm2d_fp32 PRIVATE utility)
+target_link_libraries(test_layernorm2d_fp16 PRIVATE utility)
 
-add_dependencies(test_layernorm test_layernorm_fp32)
-add_dependencies(test_layernorm test_layernorm_fp16)
+add_dependencies(test_layernorm test_layernorm2d_fp32)
+add_dependencies(test_layernorm test_layernorm2d_fp16)

test/layernorm/test_layernorm_fp16.cpp → test/layernorm/test_layernorm2d_fp16.cpp

@@ -2,13 +2,13 @@
 // Copyright (c) 2018-2022, Advanced Micro Devices, Inc. All rights reserved.
 
 #include "gtest/gtest.h"
-#include "test_layernorm_util.hpp"
+#include "test_layernorm2d_util.hpp"
 
 template <ck::index_t N>
 using I = ck::Number<N>;
 
 template <typename Tuple>
-class TestLayernormFP16 : public ck::TestLayernorm<Tuple>
+class TestLayernorm2dFP16 : public ck::TestLayernorm2d<Tuple>
 {
 };
 
@@ -25,5 +25,5 @@ using KernelTypes = ::testing::Types<
     std::tuple<ck::half_t, ck::half_t, ck::half_t, float, ck::half_t, I<2>, I<1>, I<256>, I<1>, I<256>, I<2>, I<8>, I<1>, I<8>, I<1>, I<8>, I<1>, I<8>, I<8>>
     >;
 // clang-format on
-TYPED_TEST_SUITE(TestLayernormFP16, KernelTypes);
-TYPED_TEST(TestLayernormFP16, Test_FP16) { this->Run(); }
+TYPED_TEST_SUITE(TestLayernorm2dFP16, KernelTypes);
+TYPED_TEST(TestLayernorm2dFP16, Test_FP16) { this->Run(); }

test/layernorm/test_layernorm_fp32.cpp → test/layernorm/test_layernorm2d_fp32.cpp

@@ -2,13 +2,13 @@
 // Copyright (c) 2018-2022, Advanced Micro Devices, Inc. All rights reserved.
 
 #include "gtest/gtest.h"
-#include "test_layernorm_util.hpp"
+#include "test_layernorm2d_util.hpp"
 
 template <ck::index_t N>
 using I = ck::Number<N>;
 
 template <typename Tuple>
-class TestLayernormFP32 : public ck::TestLayernorm<Tuple>
+class TestLayernorm2dFP32 : public ck::TestLayernorm2d<Tuple>
 {
 };
 
@@ -25,5 +25,5 @@ using KernelTypes = ::testing::Types<
     std::tuple<float, float, float, float, float, I<2>, I<1>, I<256>, I<1>, I<256>, I<2>, I<8>, I<1>, I<4>, I<1>, I<4>, I<1>, I<4>, I<4>>
     >;
 // clang-format on
-TYPED_TEST_SUITE(TestLayernormFP32, KernelTypes);
-TYPED_TEST(TestLayernormFP32, Test_FP32) { this->Run(); }
+TYPED_TEST_SUITE(TestLayernorm2dFP32, KernelTypes);
+TYPED_TEST(TestLayernorm2dFP32, Test_FP32) { this->Run(); }

test/layernorm/test_layernorm_util.hpp → test/layernorm/test_layernorm2d_util.hpp

@@ -31,7 +31,7 @@ std::string serialize_range(const Range& range)
 }
 
 template <typename Tuple>
-class TestLayernorm : public ::testing::Test
+class TestLayernorm2d : public ::testing::Test
 {
     protected:
     using XDataType                             = std::tuple_element_t<0, Tuple>;
@@ -86,19 +86,18 @@ class TestLayernorm : public ::testing::Test
                                                                          BetaSrcVectorSize,
                                                                          YDstVectorSize>;
 
-    TestLayernorm() : ref_instance_invoker_(ReferenceInstance{}.MakeInvoker()) {}
+    TestLayernorm2d() : ref_instance_invoker_(ReferenceInstance{}.MakeInvoker()) {}
 
-    void RunSingle(std::vector<index_t> lengths, std::vector<index_t> reduceDims)
+    void RunSingle(const std::vector<index_t>& lengths,
+                   const std::vector<index_t>& reduceDims,
+                   const std::vector<index_t>& GammaLength,
+                   const std::vector<index_t>& GammaStride,
+                   const std::vector<index_t>& BetaLength,
+                   const std::vector<index_t>& BetaStride)
     {
-        std::vector<index_t> reduceLength(reduceDims.size());
-        for(int i = 0; i < NumReduceDim; ++i)
-        {
-            reduceLength[i] = lengths[reduceDims[i]];
-        }
-
         Tensor<XDataType> x(lengths);
-        Tensor<GammaDataType> gamma(reduceLength);
-        Tensor<BetaDataType> beta(reduceLength);
+        Tensor<GammaDataType> gamma(GammaLength);
+        Tensor<BetaDataType> beta(BetaLength);
         Tensor<YDataType> y(lengths);
         Tensor<YDataType> y_ref(lengths);
 
@@ -119,8 +118,8 @@ class TestLayernorm : public ::testing::Test
         auto argument_ptr    = device_instance.MakeArgumentPointer(
             lengths,
             std::vector<ck::index_t>{x.mDesc.GetStrides().begin(), x.mDesc.GetStrides().end()},
-            {0, 1},
-            {0, 1},
+            GammaStride,
+            BetaStride,
             std::vector<ck::index_t>{y.mDesc.GetStrides().begin(), y.mDesc.GetStrides().end()},
             reduceDims,
             1e-4,
@@ -165,17 +164,16 @@ class TestLayernorm : public ::testing::Test
 
     void Run()
     {
-        for(auto length : this->lengths_)
+        std::vector<std::vector<index_t>> lengths = {
+            {4, 256}, {8, 511}, {9, 1032}, {4, 2048}, {1, 8192}, {4000, 2000}};
+
+        for(auto length : lengths)
         {
-            this->RunSingle(length, reduceDims_[0]);
+            this->RunSingle(length, {1}, {length[1]}, {0, 1}, {length[1]}, {0, 1});
         }
     }
 
-    std::vector<std::vector<index_t>> lengths_ = {
-        {4, 256}, {8, 511}, {9, 1032}, {4, 2048}, {1, 8192}, {4000, 2000}};
-
-    std::vector<std::vector<index_t>> reduceDims_ = {{1}};
-
     typename ReferenceInstance::Invoker ref_instance_invoker_;
 };
+
 } // namespace ck