Skip to content

[BACKEND][CPU] Make it buildable and runnable in a different environment #8

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
ienkovich merged 2 commits into from
May 28, 2024
Merged

[BACKEND][CPU] Make it buildable and runnable in a different environment #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23e8f5b
[BACKEND][CPU] Make it buildable and runnable in a different environment
minjang May 28, 2024
0a73b48
Revert seemingly inconsistent python code formatting
minjang May 28, 2024
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
5 changes: 3 additions & 2 deletions include/triton/Conversion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
add_subdirectory(TritonCPUToLLVM)
# TODO(minjang): I will remove these scratches soon.
# add_subdirectory(TritonCPUToLLVM)
add_subdirectory(TritonGPUToLLVM)
add_subdirectory(TritonToTritonCPU)
# add_subdirectory(TritonToTritonCPU)
add_subdirectory(TritonToTritonGPU)
5 changes: 3 additions & 2 deletions lib/Conversion/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#add_subdirectory(TritonToTritonCPU)
# TODO(minjang): I will remove these scratches soon.
# add_subdirectory(TritonToTritonCPU)
add_subdirectory(TritonToTritonGPU)
#add_subdirectory(TritonCPUToLLVM)
# add_subdirectory(TritonCPUToLLVM)
add_subdirectory(TritonGPUToLLVM)
3 changes: 0 additions & 3 deletions python/src/passes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include "triton/Analysis/Allocation.h"
#include "triton/Analysis/Membar.h"
#include "triton/Conversion/TritonGPUToLLVM/Passes.h"
#include "triton/Conversion/TritonToTritonCPU/Passes.h"
#include "triton/Conversion/TritonToTritonGPU/Passes.h"
#include "triton/Dialect/Triton/Transforms/Passes.h"
#include "triton/Dialect/TritonGPU/Transforms/Passes.h"
Expand Down Expand Up @@ -43,8 +42,6 @@ void init_triton_passes_ttir(py::module &&m) {
ADD_PASS_WRAPPER_4("add_convert_to_ttgpuir",
createConvertTritonToTritonGPUPass, const std::string &,
int, int, int);
// ADD_PASS_WRAPPER_0("add_convert_to_ttcpuir",
// createConvertTritonToTritonCPUPass);
}

void init_triton_passes_ttgpuir(py::module &&m) {
Expand Down
3 changes: 3 additions & 0 deletions python/triton/runtime/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
cc_cmd += [f'-l{lib}' for lib in libraries]
cc_cmd += [f"-L{dir}" for dir in library_dirs]
cc_cmd += [f"-I{dir}" for dir in include_dirs]
# CPU backend uses C++ (driver.cpp). Some old version compilers need a specific C++17 flag.
if src.endswith(".cpp") or src.endswith(".cc"):
cc_cmd += ["-std=c++17"]
ret = subprocess.check_call(cc_cmd)
if ret == 0:
return so
Expand Down
2 changes: 1 addition & 1 deletion third_party/cpu/backend/compiler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CPUOptions:
cluster_dims: tuple = (1, 1, 1)
extern_libs: dict = None
debug: bool = False
allowed_dot_input_precisions: Tuple[str] = ("ieee",)
allowed_dot_input_precisions: Tuple[str] = ("ieee", )
allow_fp8e4nv: bool = False
enable_fp_fusion: bool = True

Expand Down
4 changes: 3 additions & 1 deletion third_party/cpu/backend/driver.py
View file
Open in desktop
Copy link
Copy Markdown
Collaborator Author

@minjang minjang May 28, 2024

Choose a reason for hiding this comment

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

This change is due to the auto-formatter (yapf).

Copy link
Copy Markdown
Collaborator

@ienkovich ienkovich May 28, 2024

Choose a reason for hiding this comment

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

How did you run auto-formatter? I get different results when following the pre-commit check from the CI workflow:

python3 -m pip install --upgrade pre-commit
python3 -m pre_commit run --all-files --verbose yapf

Changes in compiler.py match but I have fewer changes in driver.py

Copy link
Copy Markdown
Collaborator Author

@minjang minjang May 28, 2024

Choose a reason for hiding this comment

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

Apparently, I had two Python formatter. VS Code formatter was different than yapf. Yapf didn't complain the changes from the VS Code formatter. Let me be careful for this formatting issue.

Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
"LLVMSupport",
"LLVMDemangle",
"stdc++",
"z",
]


Expand Down Expand Up @@ -176,7 +177,8 @@ def format_of(ty):
arg_ptrs_list = ', '.join(f"&arg{i}" for i, ty in signature.items()) if len(signature) > 0 else ''
kernel_fn_args = [i for i in signature.keys() if i not in constants]
kernel_fn_args_list = ', '.join(f"arg{i}" for i in kernel_fn_args) if len(kernel_fn_args) > 0 else ''
kernel_fn_arg_types = (', '.join(f"{ty_to_cpp(signature[i])}" for i in kernel_fn_args) + ", " if len(signature) > 0 else '') + "uint32_t, uint32_t, uint32_t"
kernel_fn_arg_types = (', '.join(f"{ty_to_cpp(signature[i])}" for i in kernel_fn_args) +
", " if len(signature) > 0 else '') + "uint32_t, uint32_t, uint32_t"
Comment on lines +180 to +181
Copy link
Copy Markdown
Collaborator Author

@minjang minjang May 28, 2024

Choose a reason for hiding this comment

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

Hm, looks like this is still changed by yapf.

Copy link
Copy Markdown
Collaborator

@ienkovich ienkovich May 28, 2024

Choose a reason for hiding this comment

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

This now matches what I get from the pre-commit run. Thanks!


# generate glue code
src = f"""
Expand Down
2 changes: 1 addition & 1 deletion third_party/cpu/include/TritonCPUToLLVM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
set(LLVM_TARGET_DEFINITIONS Passes.td)
mlir_tablegen(Passes.h.inc -gen-pass-decls --name TritonCPUToLLVM)
add_public_tablegen_target(TritonCPUConversionPassIncGen)
add_public_tablegen_target(TritonCPUToLLVMConversionPassIncGen)