refine names

paddle/fluid/operators/CMakeLists.txt

@@ -16,7 +16,7 @@ add_subdirectory(metrics)
 add_subdirectory(optimizers)
 add_subdirectory(reduce_ops)
 add_subdirectory(sequence_ops)
-add_subdirectory(jitkernels)
+add_subdirectory(jit)
 
 if(WITH_DISTRIBUTE)
     add_subdirectory(distributed)
@@ -68,7 +68,7 @@ set(COMMON_OP_DEPS ${COMMON_OP_DEPS} selected_rows_functor selected_rows lod_ten
 if (NOT WIN32)
     set(COMMON_OP_DEPS ${COMMON_OP_DEPS} dynload_warpctc)
 endif()
-set(COMMON_OP_DEPS ${COMMON_OP_DEPS} sequence_padding sequence_scale cos_sim_functor memory jit_kernel concat_and_split cross_entropy softmax vol2col im2col sampler)
+set(COMMON_OP_DEPS ${COMMON_OP_DEPS} sequence_padding sequence_scale cos_sim_functor memory jit_kernel_helper concat_and_split cross_entropy softmax vol2col im2col sampler)
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} sequence2batch lstm_compute matrix_bit_code gru_compute activation_functions)
 if (WITH_GPU)
   set(COMMON_OP_DEPS ${COMMON_OP_DEPS} depthwise_conv prelu)

paddle/fluid/operators/jit/CMakeLists.txt

@@ -14,8 +14,8 @@ cc_library(jit_kernel_base SRCS ${jit_kernel_cc_srcs} DEPS ${JIT_KERNEL_DEPS})
 add_subdirectory(refer)
 add_subdirectory(more)
 if(WITH_XBYAK)
-    add_subdirectory(jitcode)
+    add_subdirectory(gen)
 endif()
 
-cc_library(jit_kernel SRCS ${jit_kernel_cc_srcs} DEPS ${JIT_KERNEL_DEPS})
-cc_test(jit_kernel_test SRCS test.cc DEPS jit_kernel)
+cc_library(jit_kernel_helper SRCS ${jit_kernel_cc_srcs} DEPS ${JIT_KERNEL_DEPS})
+cc_test(jit_kernel_test SRCS test.cc DEPS jit_kernel_helper)

paddle/fluid/operators/jit/README.md

@@ -13,7 +13,7 @@ PaddlePaddle/Paddle/paddle/fluid/
 │   ├── .../
 └── jit/
     ├── ...
-    ├── jitcode/
+    ├── gen/
     │   └── ...
     |── more/
     │   ├── ...

paddle/fluid/operators/jit/gen/blas.cc

@@ -11,13 +11,14 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License. */
-#include "paddle/fluid/operators/jitkernels/jitcode/blas.h"
-#include "paddle/fluid/operators/jitkernels/registry.h"
+
+#include "paddle/fluid/operators/jit/gen/blas.h"
+#include "paddle/fluid/operators/jit/registry.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
-namespace jitcode {
+namespace jit {
+namespace gen {
 
 void VXXJitCode::genCode() {
   // do not need push stack, and do not need save avx512reg if do not use avx512
@@ -102,17 +103,17 @@ void VXXJitCode::genCode() {
   ret();
 }
 
-}  // namespace jitcode
+}  // namespace gen
 
 template <>
-std::unique_ptr<JitBase> CreateJitCode<KernelType::vmul, float, int>(int attr) {
+std::unique_ptr<GenBase> CreateJitCode<KernelType::vmul, float, int>(int attr) {
   if (UseJitCode<KernelType::vmul, float, int>(attr)) {
-    return make_unique<jitcode::VMulJitCode>(
+    return make_unique<gen::VMulJitCode>(
         attr, CodeSize<KernelType::vmul, float, int>(attr));
   }
   return nullptr;
 }
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/gen/blas.h

@@ -15,12 +15,12 @@
 #pragma once
 
 #include <string>
-#include "paddle/fluid/operators/jitkernels/jitcode/jitcode.h"
+#include "paddle/fluid/operators/jit/gen/jitcode.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
-namespace jitcode {
+namespace jit {
+namespace gen {
 
 // function: vec = Operand(vec(or scalar), vec(or scalar)) (maybe with relu)
 class VXXJitCode : public JitCode {
@@ -82,7 +82,7 @@ class VMulJitCode : public VXXJitCode {
       : VXXJitCode(d, operand_type::mul, 0, false, code_size, code_ptr) {}
 };
 
-}  // namespace jitcode
-}  // namespace jitkernels
+}  // namespace gen
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/gen/jitcode.cc

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "paddle/fluid/operators/jitkernels/jitcode/jitcode.h"
+#include "paddle/fluid/operators/jit/gen/jitcode.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 template <>
 size_t GetKey<int>(int d) {
@@ -24,15 +24,15 @@ size_t GetKey<int>(int d) {
 }
 
 // template <>
-// std::shared_ptr<const JitBase> CreateJitCode<KernelType::vmul, int>(int attr)
+// std::shared_ptr<const GenBase> CreateJitCode<KernelType::vmul, int>(int attr)
 // {
 //   if (UseJitCode<KernelType::vmul, int>(attr)) {
-//     return std::make_shared<jitcode::VMulJitCode<int>>(attr,
+//     return std::make_shared<gen::VMulJitCode<int>>(attr,
 //     CodeSize<KernelType::vmul, int>(attr)));
 //   }
 //   return nullptr;
 // }
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/gen/jitcode.h

@@ -15,7 +15,7 @@
 #pragma once
 
 #include <type_traits>
-#include "paddle/fluid/operators/jitkernels/jitcode_base.h"
+#include "paddle/fluid/operators/jit/gen_base.h"
 #include "paddle/fluid/platform/cpu_info.h"
 
 #define XBYAK_USE_MMAP_ALLOCATOR
@@ -24,8 +24,8 @@
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
-namespace jitcode {
+namespace jit {
+namespace gen {
 
 // Application Binary Interface
 constexpr Xbyak::Operand::Code abi_param1(Xbyak::Operand::RDI),
@@ -67,7 +67,7 @@ typedef enum {
 #define DECLARE_JIT_CODE(codename) \
   const char* name() const override { return #codename; }
 
-class JitCode : public JitBase, public Xbyak::CodeGenerator {
+class JitCode : public GenBase, public Xbyak::CodeGenerator {
  public:
   explicit JitCode(size_t code_size, void* code_ptr = nullptr)
       : Xbyak::CodeGenerator(code_size, code_ptr) {
@@ -128,7 +128,7 @@ class JitCode : public JitBase, public Xbyak::CodeGenerator {
   }
 };
 
-}  // namespace jitcode
-}  // namespace jitkernels
+}  // namespace gen
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/gen_base.cc

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "paddle/fluid/operators/jitkernels/jitcode_base.h"
+#include "paddle/fluid/operators/jit/gen_base.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
@@ -21,10 +21,10 @@ DEFINE_bool(dump_jitcode, false, "Whether to dump the jitcode to file");
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 // refer do not need useme, it would be the last one.
-void JitBase::dumpCode(const unsigned char* code) const {
+void GenBase::dumpCode(const unsigned char* code) const {
   if (code) {
     static int counter = 0;
     std::ostringstream filename;
@@ -38,6 +38,6 @@ void JitBase::dumpCode(const unsigned char* code) const {
   }
 }
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/gen_base.h

@@ -16,14 +16,14 @@
 
 #include <gflags/gflags.h>
 #include <memory>  // for shared_ptr
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
 #include "paddle/fluid/platform/macros.h"
 
 DECLARE_bool(dump_jitcode);
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 // TODO(TJ): make these functions as virtual of a class
 
@@ -43,7 +43,7 @@ bool UseJitCode(Attr attr) {
 template <typename Attr>
 size_t GetKey(Attr attr);
 
-class JitBase : public Kernel {
+class GenBase : public Kernel {
  public:
   virtual const char* name() const = 0;
   virtual const unsigned char* getCodeInternal() = 0;
@@ -62,8 +62,8 @@ class JitBase : public Kernel {
 };
 
 template <KernelType KT, typename T, typename Attr>
-std::unique_ptr<JitBase> CreateJitCode(Attr attr);
+std::unique_ptr<GenBase> CreateJitCode(Attr attr);
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/kernel_base.h

@@ -17,7 +17,7 @@
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 typedef enum { vmul = 0, vadd = 1, vsub, vexp } KernelType;
 
@@ -54,6 +54,6 @@ class ReferKernel : public KernelImpl<T, Func, Attr> {
   bool UseMe(Attr attr) const override { return true; }
 };
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/kernel_key.h

@@ -13,12 +13,12 @@
  * limitations under the License. */
 
 #pragma once
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
 #include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 struct KernelKey {
   struct Hash {
@@ -44,6 +44,6 @@ struct KernelKey {
   bool operator!=(const KernelKey& o) const { return !(*this == o); }
 };
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/kernel_pool.cc

@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "paddle/fluid/operators/jitkernels/kernel_pool.h"
+#include "paddle/fluid/operators/jit/kernel_pool.h"
 #include <memory>  // for shared_ptr
 #include <string>
 #include <unordered_map>
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 KernelPool& KernelPool::Instance() {
   static KernelPool g_kernel_pool;
@@ -31,6 +31,6 @@ ReferKernelPool& ReferKernelPool::Instance() {
   return g_refer_kernel_pool;
 }
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/kernel_pool.h

@@ -18,19 +18,19 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "paddle/fluid/operators/jitkernels/jitcode_base.h"
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
-#include "paddle/fluid/operators/jitkernels/kernel_key.h"
+#include "paddle/fluid/operators/jit/gen_base.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_key.h"
 #include "paddle/fluid/platform/place.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 template <KernelType KT>
 class JitCodePool {
-  typedef std::unique_ptr<JitBase> JitBasePtr;
-  typedef std::unordered_map<size_t, JitBasePtr> JitBaseMap;
+  typedef std::unique_ptr<GenBase> GenBasePtr;
+  typedef std::unordered_map<size_t, GenBasePtr> JitCodeMap;
 
  public:
   JitCodePool() = default;
@@ -39,16 +39,16 @@ class JitCodePool {
     return g_jit_codes;
   }
 
-  const JitBaseMap& AllKernels() { return codes_; }
+  const JitCodeMap& AllKernels() { return codes_; }
 
   bool Has(size_t key) const { return codes_.find(key) != codes_.end(); }
 
-  void Insert(size_t key, JitBasePtr value) {
+  void Insert(size_t key, GenBasePtr value) {
     codes_.emplace(key, std::move(value));
   }
 
  private:
-  JitBaseMap codes_;
+  JitCodeMap codes_;
   DISABLE_COPY_AND_ASSIGN(JitCodePool);
 };
 
@@ -146,6 +146,6 @@ const Func Get(Attr attr) {
   return GetRefer<KT, T, Func, Attr>();
 }
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/more/mkl/mkl.cc

@@ -12,13 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "paddle/fluid/operators/jitkernels/more/mkl/mkl.h"
-#include "paddle/fluid/operators/jitkernels/registry.h"
+#include "paddle/fluid/operators/jit/more/mkl/mkl.h"
+#include "paddle/fluid/operators/jit/registry.h"
 #include "paddle/fluid/platform/dynload/mklml.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 namespace more {
 namespace mkl {
 
@@ -34,11 +34,11 @@ void VMul<double>(const double* x, const double* y, double* z, int n) {
 
 }  // namespace mkl
 }  // namespace more
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle
 
-namespace mkl = paddle::operators::jitkernels::more::mkl;
+namespace mkl = paddle::operators::jit::more::mkl;
 
 REGISTER_JITKERNEL_MORE(vmul, mkl, mkl::VMulKernel<float>,
                         mkl::VMulKernel<double>);

paddle/fluid/operators/jit/more/mkl/mkl.h

@@ -15,12 +15,12 @@
 #pragma once
 
 #include <type_traits>
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
 #include "paddle/fluid/platform/cpu_info.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 namespace more {
 namespace mkl {
 
@@ -43,6 +43,6 @@ class VMulKernel : public KernelImpl<T, typename VMulTypes<T>::func_type,
 
 }  // namespace mkl
 }  // namespace more
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/refer/refer.cc

@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. */
 
-#include "paddle/fluid/operators/jitkernels/refer/refer.h"
-#include "paddle/fluid/operators/jitkernels/registry.h"
+#include "paddle/fluid/operators/jit/refer/refer.h"
+#include "paddle/fluid/operators/jit/registry.h"
 
-namespace refer = paddle::operators::jitkernels::refer;
+namespace refer = paddle::operators::jit::refer;
 
 REGISTER_JITKERNEL_REFER(vmul, refer::VMulKernel<float>,
                          refer::VMulKernel<double>);

paddle/fluid/operators/jit/refer/refer.h

@@ -13,12 +13,12 @@
  * limitations under the License. */
 
 #pragma once
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
 #include "paddle/fluid/platform/enforce.h"
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 namespace refer {
 
 template <typename T>
@@ -36,6 +36,6 @@ class VMulKernel : public ReferKernel<T, typename VMulTypes<T>::func_type,
 };
 
 }  // namespace refer
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/registry.h

@@ -17,14 +17,14 @@
 #include <memory>
 #include <tuple>
 #include <type_traits>
-#include "paddle/fluid/operators/jitkernels/kernel_base.h"
-#include "paddle/fluid/operators/jitkernels/kernel_pool.h"
+#include "paddle/fluid/operators/jit/kernel_base.h"
+#include "paddle/fluid/operators/jit/kernel_pool.h"
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/platform/variant.h"  // for UNUSED
 
 namespace paddle {
 namespace operators {
-namespace jitkernels {
+namespace jit {
 
 // make_unique is supported since c++14
 template <typename T, typename... Args>
@@ -76,21 +76,21 @@ class JitKernelRegistrar {
                 msg)
 
 // Refer always on CPUPlace
-#define REGISTER_JITKERNEL_REFER(kernel_type, ...)                   \
-  STATIC_ASSERT_JITKERNEL_GLOBAL_NAMESPACE(                          \
-      __reg_jitkernel_##kernel_type##_refer_CPUPlace,                \
-      "REGISTER_KERNEL_REFER must be called in global namespace");   \
-  static ::paddle::operators::jitkernels::JitKernelRegistrar<        \
-      ::paddle::operators::jitkernels::ReferKernelPool,              \
-      ::paddle::platform::CPUPlace, __VA_ARGS__>                     \
-      __jit_kernel_registrar_##kernel_type##_refer_CPUPlace_(        \
-          ::paddle::operators::jitkernels::KernelType::kernel_type); \
-  int TouchJitKernelReg_##kernel_type##_refer_CPUPlace_() {          \
-    __jit_kernel_registrar_##kernel_type##_refer_CPUPlace_.Touch();  \
-    return 0;                                                        \
+#define REGISTER_JITKERNEL_REFER(kernel_type, ...)                             \
+  STATIC_ASSERT_JITKERNEL_GLOBAL_NAMESPACE(                                    \
+      __reg_jitkernel_##kernel_type##_refer_CPUPlace,                          \
+      "REGISTER_KERNEL_REFER must be called in global namespace");             \
+  static ::paddle::operators::jit::JitKernelRegistrar<                         \
+      ::paddle::operators::jit::ReferKernelPool, ::paddle::platform::CPUPlace, \
+      __VA_ARGS__>                                                             \
+      __jit_kernel_registrar_##kernel_type##_refer_CPUPlace_(                  \
+          ::paddle::operators::jit::KernelType::kernel_type);                  \
+  int TouchJitKernelReg_##kernel_type##_refer_CPUPlace_() {                    \
+    __jit_kernel_registrar_##kernel_type##_refer_CPUPlace_.Touch();            \
+    return 0;                                                                  \
   }
 
-// kernel_type: should be in paddle::operators::jitkernels::KernelType
+// kernel_type: should be in paddle::operators::jit::KernelType
 // place_type: should be one of CPUPlace and GPUPlace in paddle::platform
 #define REGISTER_KERNEL_MORE(kernel_type, impl_type, place_type, ...)         \
   STATIC_ASSERT_JITKERNEL_GLOBAL_NAMESPACE(                                   \
@@ -99,11 +99,11 @@ class JitKernelRegistrar {
   extern int TouchJitKernelReg_##kernel_type##_refer_CPUPlace_();             \
   static int __assert_##kernel_type##_##impl_type##_##place_type##_has_refer_ \
       UNUSED = TouchJitKernelReg_##kernel_type##_refer_CPUPlace_();           \
-  static ::paddle::operators::jitkernels::JitKernelRegistrar<                 \
-      ::paddle::operators::jitkernels::KernelPool,                            \
-      ::paddle::platform::place_type, __VA_ARGS__>                            \
+  static ::paddle::operators::jit::JitKernelRegistrar<                        \
+      ::paddle::operators::jit::KernelPool, ::paddle::platform::place_type,   \
+      __VA_ARGS__>                                                            \
       __jit_kernel_registrar_##kernel_type##_##impl_type##_##place_type##_(   \
-          ::paddle::operators::jitkernels::KernelType::kernel_type);          \
+          ::paddle::operators::jit::KernelType::kernel_type);                 \
   int TouchJitKernelReg_##kernel_type##_##impl_type##_##place_type##_() {     \
     __jit_kernel_registrar_##kernel_type##_##impl_type##_##place_type##_      \
         .Touch();                                                             \
@@ -139,6 +139,6 @@ class JitKernelRegistrar {
 #define USE_JITKERNEL_MORE(kernel_type, impl_type) \
   USE_KERNEL_MORE(kernel_type, impl_type, CPUPlace)
 
-}  // namespace jitkernels
+}  // namespace jit
 }  // namespace operators
 }  // namespace paddle

paddle/fluid/operators/jit/test.cc

@@ -19,9 +19,9 @@
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 #include "gtest/gtest.h"
-#include "paddle/fluid/operators/jitkernels/kernel_pool.h"
+#include "paddle/fluid/operators/jit/kernel_pool.h"
 // TODO(TJ): remove me
-#include "paddle/fluid/operators/jitkernels/registry.h"
+#include "paddle/fluid/operators/jit/registry.h"
 
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/platform/port.h"
@@ -66,7 +66,7 @@ TEST(JitKernel, vmul) {
   using T = float;
   using PlaceType = paddle::platform::CPUPlace;
 
-  namespace jit = paddle::operators::jitkernels;
+  namespace jit = paddle::operators::jit;
   // TODO(TJ): test more vector size
   for (int d = 1; d < 30; ++d) {
     auto ref = jit::GetRefer<jit::vmul, T, jit::VMulTypes<T>::func_type,