build: relocated src/gpu/intel/ngen to third_party

oneapi-src · Jan 15, 2025 · 2d2ec7e · 2d2ec7e
1 parent d4846fa
commit 2d2ec7e
Show file tree

Hide file tree

Showing 60 changed files with 69 additions and 84 deletions.
diff --git a/src/gpu/intel/jit/CMakeLists.txt b/src/gpu/intel/jit/CMakeLists.txt
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2020-2024 Intel Corporation
+# Copyright 2020-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 set(CMAKE_CXX_CLANG_TIDY "")
 
-set(DIRS "codegen;conv;ir;ngen;pass;pooling;reorder;utils;v2")
+set(DIRS "codegen;conv;ir;pass;pooling;reorder;utils;v2")
 
 file(GLOB SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp
@@ -29,7 +29,10 @@ foreach(d ${DIRS})
         )
     list(APPEND SOURCES "${d_sources}")
 endforeach()
-
+file(GLOB_RECURSE NGEN_SOURCES
+    ${PROJECT_SOURCE_DIR}/third_party/ngen/*.cpp
+    )
+list(APPEND SOURCES "${NGEN_SOURCES}")
 
 if(DNNL_EXPERIMENTAL)
     list(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/v2/conv/planner/planner_main.cpp")

diff --git a/src/gpu/intel/jit/codegen/bank_conflict_allocation.hpp b/src/gpu/intel/jit/codegen/bank_conflict_allocation.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2021-2024 Intel Corporation
+* Copyright 2021-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include "gpu/intel/jit/codegen/reg_buf.hpp"
 #include "gpu/intel/jit/codegen/register_allocator.hpp"
 #include "gpu/intel/jit/ir/ir.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/codegen.cpp b/src/gpu/intel/jit/codegen/codegen.cpp
@@ -28,7 +28,7 @@
 #include "gpu/intel/jit/ir/eltwise.hpp"
 #include "gpu/intel/jit/ir/fma.hpp"
 #include "gpu/intel/jit/jit_eltwise_injector.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/codegen.hpp b/src/gpu/intel/jit/codegen/codegen.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 #define GPU_INTEL_JIT_CODEGEN_CODEGEN_HPP
 
 #include "gpu/intel/jit/codegen/kernel.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/kernel.hpp b/src/gpu/intel/jit/codegen/kernel.hpp
@@ -39,8 +39,8 @@
 #include "gpu/intel/jit/ir/tensor.hpp"
 #include "gpu/intel/jit/ir/walk_order.hpp"
 #include "gpu/intel/jit/jit_generator.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
-#include "gpu/intel/jit/ngen/ngen_register_allocator.hpp"
+#include "ngen/ngen.hpp"
+#include "ngen/ngen_register_allocator.hpp"
 #include "xpu/utils.hpp"
 
 namespace dnnl {

diff --git a/src/gpu/intel/jit/codegen/ngen_helpers.hpp b/src/gpu/intel/jit/codegen/ngen_helpers.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #define GPU_INTEL_JIT_CODEGEN_NGEN_HELPERS_HPP
 
 #include "gpu/intel/jit/ir/core.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
-#include "gpu/intel/jit/ngen/ngen_register_allocator.hpp"
 #include "gpu/intel/jit/utils/ngen_proxy.hpp"
+#include "ngen/ngen.hpp"
+#include "ngen/ngen_register_allocator.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/operand.hpp b/src/gpu/intel/jit/codegen/operand.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 #include "gpu/intel/jit/codegen/ngen_helpers.hpp"
 #include "gpu/intel/jit/codegen/reg_buf.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/reduce.hpp b/src/gpu/intel/jit/codegen/reduce.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include "gpu/intel/jit/codegen/register_scope.hpp"
 #include "gpu/intel/jit/codegen/reorder.hpp"
 #include "gpu/intel/jit/ir/reduce.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/reg_buf.hpp b/src/gpu/intel/jit/codegen/reg_buf.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2021-2024 Intel Corporation
+* Copyright 2021-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 #include "gpu/intel/jit/codegen/register_allocator.hpp"
 #include "gpu/intel/jit/ir/core.hpp"
 #include "gpu/intel/jit/ir/grf_permutation.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
 #include "gpu/intel/jit/utils/utils.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/register_allocator.hpp b/src/gpu/intel/jit/codegen/register_allocator.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2021-2024 Intel Corporation
+* Copyright 2021-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,9 +18,9 @@
 #define GPU_INTEL_JIT_CODEGEN_REGISTER_ALLOCATOR_HPP
 
 #include "common/z_magic.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
-#include "gpu/intel/jit/ngen/ngen_register_allocator.hpp"
 #include "gpu/intel/jit/utils/utils.hpp"
+#include "ngen/ngen.hpp"
+#include "ngen/ngen_register_allocator.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/register_scope.hpp b/src/gpu/intel/jit/codegen/register_scope.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 
 #include "gpu/intel/jit/codegen/ngen_helpers.hpp"
 #include "gpu/intel/jit/codegen/reg_buf.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
-#include "gpu/intel/jit/ngen/ngen_register_allocator.hpp"
+#include "ngen/ngen.hpp"
+#include "ngen/ngen_register_allocator.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/reorder.hpp b/src/gpu/intel/jit/codegen/reorder.hpp
@@ -22,9 +22,9 @@
 #include "gpu/intel/jit/codegen/register_scope.hpp"
 #include "gpu/intel/jit/ir/reorder.hpp"
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
 #include "gpu/intel/jit/utils/iterator.hpp"
 #include "gpu/intel/jit/utils/range.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/codegen/send.hpp b/src/gpu/intel/jit/codegen/send.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 #include "gpu/intel/jit/codegen/register_scope.hpp"
 #include "gpu/intel/jit/ir/message.hpp"
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/conv/key.cpp b/src/gpu/intel/jit/conv/key.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2023-2024 Intel Corporation
+* Copyright 2023-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 #include "common/utils.hpp"
 #include "gpu/intel/jit/conv/config.hpp"
 #include "gpu/intel/jit/ir/hw.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
 #include "gpu/intel/jit/utils/utils.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/conv/plan_utils.hpp b/src/gpu/intel/jit/conv/plan_utils.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2023-2024 Intel Corporation
+* Copyright 2023-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,8 +21,8 @@
 #include <string>
 
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
 #include "gpu/intel/jit/utils/utils.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/conv/zero_out.hpp b/src/gpu/intel/jit/conv/zero_out.hpp
@@ -22,7 +22,7 @@
 #include "gpu/intel/jit/ir/kernel_desc.hpp"
 #include "gpu/intel/jit/ir/kernel_info.hpp"
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/emulated_generator.hpp b/src/gpu/intel/jit/emulated_generator.hpp
@@ -18,13 +18,13 @@
 #define GPU_INTEL_JIT_EMULATED_GENERATOR_HPP
 
 // Must be included before emulation.hpp
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 #include "gpu/intel/compute/device_info.hpp"
 #include "gpu/intel/jit/codegen/register_allocator.hpp"
 #include "gpu/intel/jit/emulation.hpp"
 #include "gpu/intel/jit/jit_generator.hpp"
-#include "gpu/intel/jit/ngen/ngen_core.hpp"
+#include "ngen/ngen_core.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/emulation.hpp b/src/gpu/intel/jit/emulation.hpp
@@ -17,7 +17,7 @@
 #ifndef GPU_INTEL_JIT_EMULATION_HPP
 #define GPU_INTEL_JIT_EMULATION_HPP
 
-#include "gpu/intel/jit/ngen/ngen_config.hpp"
+#include "ngen/ngen_config.hpp"
 #ifdef NGEN_ENABLE_SOURCE_LOCATION
 #include <source_location>
 #endif

diff --git a/src/gpu/intel/jit/gemm/generator/.clang-format b/src/gpu/intel/jit/gemm/generator/.clang-format
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2019-2024 Intel Corporation
+# Copyright 2019-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/src/gpu/intel/jit/gemm/generator/microkernel_provider.cpp b/src/gpu/intel/jit/gemm/generator/microkernel_provider.cpp
@@ -20,7 +20,7 @@
 #include "generator.hpp"
 #include "kernel_selector.hpp"
 #include "strategy_parser.hpp"
-#include "npack/neo_packager.hpp"
+#include "ngen/npack/neo_packager.hpp"
 
 #include "internal/namespace_start.hxx"
 

diff --git a/src/gpu/intel/jit/gemm/include/.clang-format b/src/gpu/intel/jit/gemm/include/.clang-format
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2019-2024 Intel Corporation
+# Copyright 2019-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/src/gpu/intel/jit/gemm/include/internal/ngen_includes.hpp b/src/gpu/intel/jit/gemm/include/internal/ngen_includes.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2019-2024 Intel Corporation
+* Copyright 2019-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 #include "../config.hpp"
 
-#   include "gpu/intel/jit/ngen/ngen_opencl.hpp"
-#   include "gpu/intel/jit/ngen/ngen_register_allocator.hpp"
+#   include "ngen/ngen_opencl.hpp"
+#   include "ngen/ngen_register_allocator.hpp"
diff --git a/src/gpu/intel/jit/gemm/selector/.clang-format b/src/gpu/intel/jit/gemm/selector/.clang-format
@@ -1,5 +1,5 @@
 #===============================================================================
-# Copyright 2019-2024 Intel Corporation
+# Copyright 2019-2025 Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/src/gpu/intel/jit/ir/fma.hpp b/src/gpu/intel/jit/ir/fma.hpp
@@ -21,7 +21,7 @@
 #include <string>
 
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/ir/slm_reduce_builder.hpp b/src/gpu/intel/jit/ir/slm_reduce_builder.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright 2022-2024 Intel Corporation
+* Copyright 2022-2025 Intel Corporation
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 #include "gpu/intel/jit/ir/hw.hpp"
 #include "gpu/intel/jit/ir/ir.hpp"
 #include "gpu/intel/jit/ir/tensor.hpp"
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 #include <vector>
 

diff --git a/src/gpu/intel/jit/jit_generator.hpp b/src/gpu/intel/jit/jit_generator.hpp
@@ -20,7 +20,7 @@
 #include <memory>
 
 // Must be included before emulation.hpp
-#include "gpu/intel/jit/ngen/ngen.hpp"
+#include "ngen/ngen.hpp"
 
 #include "common/impl_registration.hpp"
 #include "common/nstl.hpp"
@@ -32,7 +32,7 @@
 #include "gpu/intel/ocl/ocl_gpu_engine.hpp"
 #include "xpu/utils.hpp"
 
-#include "gpu/intel/jit/ngen/ngen_opencl.hpp"
+#include "ngen/ngen_opencl.hpp"
 
 namespace dnnl {
 namespace impl {

diff --git a/src/gpu/intel/jit/jit_reduction_generator.hpp b/src/gpu/intel/jit/jit_reduction_generator.hpp
@@ -24,9 +24,9 @@
 #include "gpu/intel/jit/emulated_generator.hpp"
 #include "gpu/intel/jit/jit_generator.hpp"
 #include "gpu/intel/jit/jit_reduction_injector.hpp"
-#include "gpu/intel/jit/ngen/ngen_core.hpp"
-#include "gpu/intel/jit/ngen/ngen_interface.hpp"
 #include "gpu/intel/utils.hpp"
+#include "ngen/ngen_core.hpp"
+#include "ngen/ngen_interface.hpp"
 
 namespace dnnl {
 namespace impl {