Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/triton-llvm-opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Copy link
Contributor

@etiotto etiotto Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we really need to add this to this (common) makefile, it wasn't required for the PostProcessing library.

Copy link
Contributor Author

@alexbaden alexbaden Dec 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PostProcessing does not test passes via lit test, but the FreezeMaskedLayout pass (which is now part of the same library) does.

Copy link
Contributor

@etiotto etiotto Dec 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see

#include "llvm/CodeGen/CommandFlags.h"
#include "llvm/IR/Constants.h"
#include "llvm/IR/DataLayout.h"
Expand Down
1 change: 0 additions & 1 deletion third_party/intel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ add_triton_plugin(TritonXPU

LINK_LIBS
MLIRGPUToLLVMSPV
PostProcessLLVMIR
TritonGENToLLVM
TritonGENToLLVMIRTranslation
TritonIntelGPUToLLVM
Expand Down
1 change: 0 additions & 1 deletion third_party/intel/lib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 0 additions & 6 deletions third_party/intel/lib/LLVMIR/CMakeLists.txt
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion third_party/intel/lib/Target/LLVMIR/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
add_subdirectory(Dialect)

add_mlir_translation_library(PostProcessLLVMIR
add_triton_library(TritonIntelLLVMIR
PostProcess.cpp
SLPVectorizer.cpp
LLVMIRFreezeMaskedDivRem.cpp

DEPENDS
LLVMIRIncGen
)
0 ...l/lib/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp → ...arget/LLVMIR/LLVMIRFreezeMaskedDivRem.cpp
View file
Open in desktop
File renamed without changes.
0 third_party/intel/lib/LLVMIR/LLVMPasses.h → ...arty/intel/lib/Target/LLVMIR/LLVMPasses.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion third_party/intel/triton_xpu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down