Skip to content

[ROCm] Fix compilation issues related to aa08925e2dd1351c68e7838e074fe35908e3 #11331

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

Closed
zoranjovanovic-ns wants to merge 1 commit into from
Closed

[ROCm] Fix compilation issues related to aa08925e2dd1351c68e7838e074fe35908e3 #11331

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 third_party/tsl/third_party/gpus/rocm/build_defs.bzl.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def rocm_hipblaslt():
return %{rocm_is_configured} and %{rocm_hipblaslt}

def if_rocm_hipblaslt(x):
if %{rocm_is_configured} and (%{rocm_hipblaslt} == "True"):
if %{rocm_is_configured} and (%{rocm_hipblaslt} == True):
return select({"//conditions:default": x})
return select({"//conditions:default": []})

Expand Down
9 changes: 5 additions & 4 deletions xla/service/gpu/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,14 +588,15 @@ cc_library(
"@tsl//tsl/platform:status",
"@tsl//tsl/platform:statusor",
"@tsl//tsl/platform:tensor_float_32_utils",
] + if_cuda_is_configured([
] + if_gpu_is_configured([
"@triton//:TritonNvidiaGPUTransforms",
"@triton//:TritonGPUToLLVM",
"@triton//:TritonToTritonGPU",
]) + if_cuda_is_configured([
"@triton//third_party/nvidia:NVGPUToLLVM",
"@triton//third_party/nvidia:TritonNVIDIAGPUToLLVM",
"@triton//:TritonGPUTransforms",
"@triton//:TritonNvidiaGPUTransforms",
"@triton//:TritonLLVMIR",
"@triton//:TritonToTritonGPU",
"@triton//:TritonGPUToLLVM",
]),
)

Expand Down
9 changes: 6 additions & 3 deletions xla/service/gpu/ir_emitter_triton_rocm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
==============================================================================*/
#include "third_party/amd/include/TritonAMDGPUToLLVM/Passes.h"
// TODO(ROCm): Enable and include ROCm Triton passes when ROCm Triton is
// included in build.
//#include "third_party/amd/include/TritonAMDGPUToLLVM/Passes.h"
#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h" // from @llvm-project
#include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h" // from @llvm-project
#include "mlir/Conversion/IndexToLLVM/IndexToLLVM.h" // from @llvm-project
Expand All @@ -24,6 +26,7 @@ limitations under the License.
#include "xla/service/hlo_module_config.h"
#include "tsl/platform/rocm_rocdl_path.h"
#include "triton/Conversion/TritonToTritonGPU/TritonToTritonGPUPass.h"
#include "triton/Conversion/TritonGPUToLLVM/Passes.h"
#include "triton/Dialect/Triton/Transforms/Passes.h"
#include "triton/Dialect/TritonGPU/Transforms/Passes.h"
#include "triton/Dialect/TritonNvidiaGPU/Transforms/Passes.h"
Expand Down Expand Up @@ -88,11 +91,11 @@ absl::Status CreateTritonPipeline(

// Based on make_llir() in
// @triton//:third_party/nvidia/backend/compiler.py
pm.addPass(mt::gpu::createDecomposeUnsupportedConversionsPass());
//pm.addPass(mt::gpu::createDecomposeUnsupportedConversionsPass());
pm.addPass(mlir::createConvertSCFToCFPass());
pm.addPass(mlir::createConvertIndexToLLVMPass());
pm.addPass(mt::gpu::createAllocateSharedMemoryPass());
pm.addPass(mt::createConvertTritonAMDGPUToLLVMPass());
//pm.addPass(mt::createConvertTritonAMDGPUToLLVMPass());
pm.addPass(mlir::createArithToLLVMConversionPass());
pm.addPass(mlir::createCanonicalizerPass());
pm.addPass(mlir::createCSEPass());
Expand Down
1 change: 1 addition & 0 deletions xla/service/gpu/llvm_gpu_backend/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ cc_library(
] + if_rocm_is_configured([
"@local_config_rocm//rocm:rocm_headers",
"@llvm-project//llvm:AMDGPUCodeGen",
"@llvm-project//llvm:AMDGPUAsmParser",
]),
)

Expand Down