Unify Intel LLVM optimizations under lib/Target/LLVMIR

Author: alexbaden

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"

third_party/intel/CMakeLists.txt

@@ -9,7 +9,6 @@ add_triton_plugin(TritonXPU
 
   LINK_LIBS
   MLIRGPUToLLVMSPV
-  PostProcessLLVMIR
   TritonGENToLLVM
   TritonGENToLLVMIRTranslation
   TritonIntelGPUToLLVM

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)

third_party/intel/lib/LLVMIR/CMakeLists.txt

@@ -1,8 +1,12 @@
 add_subdirectory(Dialect)
 
-add_mlir_translation_library(PostProcessLLVMIR
+add_triton_library(TritonIntelLLVMIR
   DSE.cpp
   LICM.cpp
   PostProcess.cpp
   SLPVectorizer.cpp
+  LLVMIRFreezeMaskedDivRem.cpp
+
+  DEPENDS
+  LLVMIRIncGen
 )

third_party/intel/lib/Target/LLVMIR/CMakeLists.txt

@@ -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 "triton/Target/SPIRV/SPIRVTranslation.h"
 #include "triton/Tools/Sys/GetEnv.hpp"