merge main

Author: xurui1995

.github/workflows/build-gpu-imex.yml

@@ -0,0 +1,47 @@
+name: Graph Compiler build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+permissions: read-all
+
+jobs:
+  build:
+    name: Build GPU with IMEX
+    runs-on: [self-hosted, l0]
+
+    env:
+      GH_TOKEN: ${{ github.token }}    
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set LLVM hash
+        run: |
+          echo LLVM_HASH=$(cat cmake/llvm-version-imex.txt) >>$GITHUB_ENV
+
+      - name: Fetch requirements for python binding
+        uses: actions/checkout@v4
+        with:
+          repository: llvm/llvm-project
+          ref: ${{ env.LLVM_HASH }}
+          sparse-checkout: mlir/python/requirements.txt
+          sparse-checkout-cone-mode: false
+          path: llvm-dep
+
+      - name: Install requirements
+        run: python3 -m pip install -r llvm-dep/mlir/python/requirements.txt
+
+      - name: Build
+        run: |
+          scripts/compile.sh --imex
+
+      - name: Test
+        run: |
+          cmake --build build --target gc-check

.github/workflows/build-llvm.yml

@@ -13,21 +13,41 @@ jobs:
   build:
     name: Build
     runs-on: [self-hosted]
+    strategy:
+      matrix:
+        build-type: [CPU, IMEX]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Set LLVM hash
         run: |
-          echo LLVM_HASH=$(cat cmake/llvm-version.txt) >>$GITHUB_ENV
+          if [ "${{ matrix.build-type }}" = "IMEX" ]; then
+            echo LLVM_HASH=$(cat cmake/llvm-version-imex.txt) >>$GITHUB_ENV
+            echo IMEX_HASH=$(cat cmake/imex-version.txt) >>$GITHUB_ENV
+          else
+            echo LLVM_HASH=$(cat cmake/llvm-version.txt) >>$GITHUB_ENV
+          fi
+
+      - uses: actions/checkout@v4
+        with:
+          repository: Menooker/mlir-extensions
+          ref: ${{ env.IMEX_HASH }}
+          path: mlir-extensions
+        if: ${{ matrix.build-type == 'IMEX' }}
 
       - uses: actions/checkout@v4
         with:
           repository: llvm/llvm-project
           ref: ${{ env.LLVM_HASH }}
+          path: llvm-project
 
       - name: Build
         run: |
+          cd llvm-project
+          if [ "${{ matrix.build-type }}" = "IMEX" ]; then
+            git apply ../mlir-extensions/build_tools/patches/*
+          fi
           python3 -m pip install -r mlir/python/requirements.txt
           mkdir llvm-install
           cmake -G Ninja llvm -B build -DCMAKE_INSTALL_PREFIX=llvm-install -DMLIR_ENABLE_BINDINGS_PYTHON=ON -DPython3_EXECUTABLE=$(which python3) \
@@ -36,9 +56,18 @@ jobs:
           cd llvm-install
           tar -zcf ../llvm.tgz .
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload LLVM for CPU
+        if: matrix.build-type == 'CPU'
+        uses: actions/upload-artifact@v4
         with:
           name: llvm-${{ env.LLVM_HASH }}
-          path: llvm.tgz
+          path: ./llvm-project/llvm.tgz
+
+      - name: Upload LLVM for IMEX
+        if: matrix.build-type == 'IMEX'
+        uses: actions/upload-artifact@v4
+        with:
+          name: llvm-${{ env.LLVM_HASH }}-imex-patched
+          path: ./llvm-project/llvm.tgz
 
 

.github/workflows/clang-tidy.yml

@@ -81,7 +81,8 @@ jobs:
           -DCMAKE_EXPORT_COMPILE_COMMANDS=True \
           -DCMAKE_C_COMPILER=$(which clang) \
           -DCMAKE_CXX_COMPILER=$(which clang++) \
-          -DLLVM_EXTERNAL_LIT=$(which lit)
+          -DLLVM_EXTERNAL_LIT=$(which lit) \
+          -DDNNL_USE_CLANG_SANITIZER="Undefined"
 
     - name: Prepare inc file
       run: |

CMakeLists.txt

@@ -29,29 +29,41 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85827 for details. The issue is
 # fixed in GCC 10.
 if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0")
+  include(CheckCXXCompilerFlag)
   check_cxx_compiler_flag("-Wno-unused-but-set-parameter" CXX_SUPPORTS_WNO_UNUSED_BUT_SET_PARAMETER)
-  append_if(CXX_SUPPORTS_WNO_UNUSED_BUT_SET_PARAMETER "-Wno-unused-but-set-parameter" CMAKE_CXX_FLAGS)
+  if(CXX_SUPPORTS_WNO_UNUSED_BUT_SET_PARAMETER)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter")
+  endif()
 endif()
 ################################################################################
 
 ############################ Build options #####################################
 option(GC_ENABLE_LEGACY ON)
-option(GC_ENABLE_DNNL "Enable the oneDNN library integration" ON)
+option(GC_ENABLE_DNNL_API "Enable the oneDNN library API integration" ON)
 option(GC_ENABLE_TEST "Build the tests" ON)
-option(GC_ENABLE_TEST_DNNL "Build the dnnl tests" ${GC_ENABLE_DNNL})
+option(GC_ENABLE_TEST_DNNL_API "Build the dnnl tests" ${GC_ENABLE_DNNL_API})
 option(GC_ENABLE_TEST_MLIR "Build the mlir tests" ON)
 option(GC_ENABLE_TOOLS "Build the tools" ON)
 option(GC_ENABLE_OPT "Build gc-opt" ${GC_ENABLE_TOOLS})
 option(GC_ENABLE_IMEX "Enable Intel® Extension for MLIR" OFF)
 option(GC_ENABLE_BINDINGS_PYTHON "Enable Graph Complier Python Binding" ON)
 option(GC_DEV_LINK_LLVM_DYLIB "Link dynamic libraries of LLVM and MLIR. For developers only. Do not use it in packing the library." OFF)
+option(GC_ENABLE_RUNTIME_NAIVE_BRGEMM "Use naive BRGEMM as runtime backend for debug purpose." OFF)
 
 if(GC_ENABLE_LEGACY)
   add_subdirectory(legacy/core)
 endif()
 
-if(GC_ENABLE_DNNL)
+
+if (GC_ENABLE_IMEX)
+  # normalize the value for lit config
+  set(GC_ENABLE_IMEX ON)
+endif()
+
+if(GC_ENABLE_DNNL_API)
   set(GC_ONEDNN_DIALECT_LIB_NAME MLIROneDNNGraph)
+  # normalize the value for lit config
+  set(GC_ENABLE_DNNL_API ON)
 endif()
 ################################################################################
 

cmake/imex-version.txt

@@ -0,0 +1 @@
+d5bbd635dee500b8cff138686833bacfac5ade78

cmake/imex.cmake

@@ -6,9 +6,15 @@ if (NOT DEFINED IMEX_INCLUDES)
         message(WARN "GPU backend may not be compatible with dynamic linking to LLVM")
     endif()
 
+    # Read the content of imex-version.txt
+    file(READ "${CMAKE_CURRENT_LIST_DIR}/imex-version.txt" IMEX_HASH)
+
+    # Strip any extra whitespace or newlines
+    string(STRIP "${IMEX_HASH}" IMEX_HASH)
+
     # TODO: Change to main https://github.com/intel/mlir-extensions when all the
     # required functionality is merged.
-    gc_fetch_content(imex 496b240093b5e132b60c5ee69878300fe69be300 https://github.com/Menooker/mlir-extensions
+    gc_fetch_content(imex "${IMEX_HASH}" https://github.com/Menooker/mlir-extensions
             SET IMEX_CHECK_LLVM_VERSION=ON IMEX_ENABLE_L0_RUNTIME=0
     )
 

cmake/llvm-version-imex.txt

@@ -0,0 +1 @@
+89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be

cmake/llvm-version.txt

@@ -1 +1 @@
-89946bda5e1c7ceaf6d26634cc8c8c9498d9f7be
+8345289ded788f4df79f59df76df0c0437c3df64

cmake/onednn.cmake

@@ -13,18 +13,9 @@ if (NOT DEFINED GC_DNNL_INCLUDES)
         $<BUILD_INTERFACE:${dnnl_SOURCE_DIR}/include>
         $<BUILD_INTERFACE:${dnnl_SOURCE_DIR}/src>
     )
+    
     set_property(GLOBAL PROPERTY GC_DNNL_INCLUDES ${GC_DNNL_INCLUDES})
+    set_property(GLOBAL PROPERTY GC_DNNL_SOURCE_DIR ${dnnl_SOURCE_DIR})
 
-    # This allows to generate headers from *.in without adding the library to the build.
-    # If the build is required, remove this and the SKIP_ADD option above.
-    if (DEFINED CMAKE_GENERATOR)
-        set(GENERATOR_FLAG "-G ${CMAKE_GENERATOR}")
-    endif ()
-    execute_process(COMMAND ${CMAKE_COMMAND} ${GENERATOR_FLAG}
-            -Wno-dev
-            -S ${dnnl_SOURCE_DIR}
-            -B ${dnnl_BINARY_DIR}
-            -DDNNL_IS_MAIN_PROJECT=FALSE -DDNNL_BUILD_TESTS=FALSE -DDNNL_BUILD_EXAMPLES=FALSE
-            COMMAND_ERROR_IS_FATAL ANY
-    )
+    include(onednn_lite_config)
 endif ()