Unify Intel LLVM optimizations under lib/Target/LLVMIR (#2900)

intel · Dec 6, 2024 · daa8c28 · daa8c28
1 parent 963ba2b
commit daa8c28
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 11 deletions.
diff --git a/bin/triton-llvm-opt.cpp b/bin/triton-llvm-opt.cpp
@@ -1,7 +1,7 @@
 /// Trimmed down clone of llvm opt to be able to test triton custom llvm ir
 /// passes.
 #include "lib/Target/LLVMIR/LLVMPasses.h"
-#include "third_party/intel/lib/LLVMIR/LLVMPasses.h"
+#include "third_party/intel/lib/Target/LLVMIR/LLVMPasses.h"
 #include "llvm/CodeGen/CommandFlags.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"

diff --git a/third_party/intel/CMakeLists.txt b/third_party/intel/CMakeLists.txt
@@ -13,7 +13,6 @@ add_triton_plugin(TritonXPU
 
   LINK_LIBS
   MLIRGPUToLLVMSPV
-  PostProcessLLVMIR
   TritonGENToLLVM
   TritonGENToLLVMIRTranslation
   TritonIntelGPUToLLVM

diff --git a/third_party/intel/lib/CMakeLists.txt b/third_party/intel/lib/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(Analysis)
 add_subdirectory(Dialect)
 add_subdirectory(GPUToTritonGEN)
-add_subdirectory(LLVMIR)
 add_subdirectory(Target)
 add_subdirectory(TritonAnnotateModule)
 add_subdirectory(TritonGENToLLVM)

diff --git a/third_party/intel/lib/LLVMIR/CMakeLists.txt b/third_party/intel/lib/LLVMIR/CMakeLists.txt
diff --git a/third_party/intel/lib/Target/LLVMIR/CMakeLists.txt b/third_party/intel/lib/Target/LLVMIR/CMakeLists.txt
@@ -1,6 +1,10 @@
 add_subdirectory(Dialect)
 
-add_mlir_translation_library(PostProcessLLVMIR
+add_triton_library(TritonIntelLLVMIR
   PostProcess.cpp
   SLPVectorizer.cpp
+  LLVMIRFreezeMaskedDivRem.cpp
+
+  DEPENDS
+  LLVMIRIncGen
 )
diff --git a/...l/lib/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp → ...arget/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp b/...l/lib/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp → ...arget/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp
diff --git a/third_party/intel/lib/LLVMIR/LLVMPasses.h → ...arty/intel/lib/Target/LLVMIR/LLVMPasses.h b/third_party/intel/lib/LLVMIR/LLVMPasses.h → ...arty/intel/lib/Target/LLVMIR/LLVMPasses.h
diff --git a/third_party/intel/triton_xpu.cc b/third_party/intel/triton_xpu.cc
@@ -16,7 +16,7 @@
 #include "intel/include/TritonAnnotateModule/Passes.h"
 #include "intel/include/TritonIntelGPUToLLVM/Passes.h"
 #include "intel/include/TritonToTritonGPUWarp/Passes.h"
-#include "intel/lib/LLVMIR/LLVMPasses.h"
+#include "intel/lib/Target/LLVMIR/LLVMPasses.h"
 
 #include "intel/include/Target/SPIRV/SPIRVTranslation.h"
 #include "triton/Tools/Sys/GetEnv.hpp"