Skip to content

Commit 4bffdb7

Browse files
MKashirnyyVsevolod1983BradPepersAMD
authored
[MIOpen][MLIR][GraphAPI] Dead code removal MLIR + GraphAPI (#4387)
approved dead code removal. In this case whole MLIR and GraphAPI components are removed completely --------- Co-authored-by: Vsevolod Golovko <vsevolod.golovko@amd.com> Co-authored-by: BradPepersAMD <Brad.Pepers@amd.com>
1 parent 0c259bd commit 4bffdb7

File tree

115 files changed

+43
-24774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+43
-24774
lines changed

projects/miopen/.jenkins/perf_test

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ pipeline {
2424
Full_test = " -DMIOPEN_TEST_ALL=Off"
2525
Smoke_targets = " check MIOpenDriver"
2626
NOCOMGR_flags = " -DMIOPEN_USE_COMGR=Off"
27-
NOMLIR_flags = " -DMIOPEN_USE_MLIR=Off"
2827
perftest_image = docker.image('ubuntu:22.04')
2928
}
3029
parameters {

projects/miopen/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
# Change Log for MIOpen
33

44
Full documentation for MIOpen is available [here](https://rocm.docs.amd.com/projects/MIOpen/en/latest/)
5+
## MIOpen 3.6.0 for ROCm 7.12.0
6+
### Removed
7+
* Removed MLIR compilation backend (`MIOPEN_USE_MLIR`) and all MLIR-based solvers
8+
* Removed GraphAPI experimental feature and related code
9+
510
## MIOpen 3.5.1 for ROCm 7.12.0
611
### Added
712
* [Conv] Enabled CK wrw and bwd solvers with split-k disabled in deterministic mode.

projects/miopen/CMakeLists.txt

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ if(MIOPEN_STRIP_SYMBOLS AND NOT WIN32 AND NOT APPLE)
116116
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
117117
endif()
118118

119-
rocm_setup_version(VERSION 3.5.1)
119+
rocm_setup_version(VERSION 3.6.0)
120120

121121
include(TargetFlags)
122122

@@ -402,37 +402,6 @@ else()
402402
message(STATUS "clang-offload-bundler not found")
403403
endif()
404404

405-
set_var_to_condition(MIOPEN_USE_MLIR_DEFAULT NOT (NOT ${BUILD_SHARED_LIBS} AND ${MIOPEN_USE_COMGR}))
406-
option(MIOPEN_USE_MLIR "Use MLIR compilation backend" ${MIOPEN_USE_MLIR_DEFAULT})
407-
408-
if(MIOPEN_USE_MLIR)
409-
if(NOT ${BUILD_SHARED_LIBS} AND ${MIOPEN_USE_COMGR})
410-
message(FATAL_ERROR "Potential symbol conflict between mlir and comgr in static build")
411-
endif()
412-
if(WIN32)
413-
# Windows does not support earlier ROCm versions hence no fallback to MLIRMIOpen.
414-
find_package(rocMLIR 1.0.0 CONFIG REQUIRED)
415-
else()
416-
# Try to find package rocMLIR
417-
# REQUIRED is omitted since we do not want cmake to abort if the package is not found
418-
find_package(rocMLIR 1.0.0 CONFIG)
419-
if(NOT rocMLIR_FOUND)
420-
message(STATUS "Falling back to find library libMLIRMIOpen")
421-
# Backward compatibility with ROCm 5.3
422-
# If the rocMLIR package is not found, try to find the library libMLIRMIOpen directly
423-
find_library(LIBMLIRMIOPEN MLIRMIOpen REQUIRED)
424-
if(NOT LIBMLIRMIOPEN)
425-
message(FATAL_ERROR "library libMLIRMIOpen not found, please reinstall dependencies. \
426-
Refer to https://github.com/ROCm/MIOpen#installing-the-dependencies")
427-
else()
428-
message(STATUS "Build with library libMLIRMIOpen: " ${LIBMLIRMIOPEN})
429-
set(rocMLIR_VERSION 0.0.1)
430-
endif()
431-
endif()
432-
endif()
433-
message(STATUS "Build with rocMLIR::rockCompiler ${rocMLIR_VERSION} ${rocMLIR_DIR}")
434-
endif()
435-
436405
# Update HIP Runtime Package Dependency
437406
if(ENABLE_ASAN_PACKAGING)
438407
set(DEPENDS_HIP_RUNTIME "hip-runtime-amd-asan" )

projects/miopen/Jenkinsfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def get_branch_name(){
2727
/// * The default compiler is usually not specified.
2828
/// BuildType := { Release* | Debug | Install } [ BuildTypeModifier ]
2929
/// * BuildTypeModifier := { NOCOMGR | Embedded | Static | Normal-Find | Fast-Find
30-
/// NOCK | NOMLIR | Tensile | Tensile-Latest | Package | ... }
30+
/// NOCK | Tensile | Tensile-Latest | Package | ... }
3131
/// TestSet := { All | Smoke* | <Performance Dataset> | Build-only }
3232
/// * "All" corresponds to "cmake -DMIOPEN_TEST_ALL=On".
3333
/// * "Smoke" (-DMIOPEN_TEST_ALL=Off) is the default and usually not specified.
@@ -300,7 +300,7 @@ pipeline {
300300

301301
Smoke_targets = " check MIOpenDriver"
302302
NOCOMGR_flags = " -DMIOPEN_USE_COMGR=Off"
303-
NOMLIR_flags = " -DMIOPEN_USE_MLIR=Off"
303+
304304
CK_DIR = "${ckDir}"
305305
MIOPEN_DIR = "${miopenDir}"
306306
PROJ_DIR = "${projDir}"
@@ -658,7 +658,7 @@ pipeline {
658658
}
659659
}
660660
// GFX90A Tests
661-
stage('Fp32 Hip Debug NOMLIR gfx90a') {
661+
stage('Fp32 Hip Debug gfx90a') {
662662
when {
663663
beforeAgent true
664664
expression { params.TARGET_GFX90A }
@@ -669,12 +669,12 @@ pipeline {
669669
agent{ label rocmnode("gfx90a") }
670670
environment{
671671
// Can be removed altogether with when WORKAROUND_SWDEV_290754.
672-
NOMLIR_build_cmd = "CTEST_PARALLEL_LEVEL=4 MIOPEN_LOG_LEVEL=5 make -j\$(nproc) check"
672+
debug_build_cmd = "CTEST_PARALLEL_LEVEL=4 MIOPEN_LOG_LEVEL=5 make -j\$(nproc) check"
673673
}
674674
steps{
675675
script {
676676
withWorkingDir {
677-
utils.buildHipClangJob( build_type: 'debug', setup_flags: NOMLIR_flags + gfx90a_flags, build_cmd: NOMLIR_build_cmd, test_flags: ' --verbose ', build_install: true, gpu_family: "gfx90X")
677+
utils.buildHipClangJob( build_type: 'debug', setup_flags: gfx90a_flags, build_cmd: debug_build_cmd, test_flags: ' --verbose ', build_install: true, gpu_family: "gfx90X")
678678
}
679679
}
680680
}
@@ -718,7 +718,7 @@ pipeline {
718718
steps{
719719
script {
720720
withWorkingDir {
721-
utils.buildHipClangJob( setup_flags: "-DBUILD_SHARED_LIBS=Off" + gfx90a_flags, mlir_build: 'OFF', build_install: true, gpu_family: "gfx90X")
721+
utils.buildHipClangJob( setup_flags: "-DBUILD_SHARED_LIBS=Off" + gfx90a_flags, build_install: true, gpu_family: "gfx90X")
722722
}
723723
}
724724
}

projects/miopen/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ To install MIOpen, you must first install these prerequisites:
4747
* [hipBLASLt](https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblaslt): AMD's flexible Basic Linear Algebra Subprograms
4848
(BLAS) API.
4949
* [hipBLAS](https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipblas): AMD's (BLAS) marshalling library.
50-
* [Multi-Level Intermediate Representation (MLIR)](https://github.com/ROCm/rocMLIR) with its
51-
MIOpen dialect to support and complement kernel development
5250
* [Composable Kernel](https://github.com/ROCm/composable_kernel): A C++ templated device library
5351
for GEMM-like and reduction-like operators.
5452

projects/miopen/docs/install/prerequisites.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,5 @@ all types of MIOpen installations.
2828
* Minimum version for post-ROCm 3.5
2929
`master-rocm-3.5 <https://github.com/ROCm/rocBLAS/tree/master-rocm-3.5>`_
3030

31-
* `Multi-Level Intermediate Representation (MLIR) <https://github.com/ROCm/rocMLIR>`_, with an
32-
MIOpen dialect to support and complement kernel development
3331
* :doc:`Composable Kernel <composable_kernel:index>`: A C++ templated device library for
3432
GEMM-like and reduction-like operators.

projects/miopen/docs/reference/env_variables.rst

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -945,28 +945,6 @@ following table.
945945
- | 0: Disable
946946
| 1: Enable
947947
948-
MLIR solution control
949-
=====================
950-
951-
The MLIR solution control environment variables for MIOpen are collected in the following table.
952-
953-
.. list-table::
954-
:header-rows: 1
955-
:widths: 70,30
956-
957-
* - **Environment variable**
958-
- **Value**
959-
960-
* - | ``MIOPEN_DEBUG_CONV_MLIR_IGEMM_WRW_XDLOPS``
961-
| Controls MLIR implicit GEMM weight-gradient XDLOPS solution.
962-
- | 0: Disable
963-
| 1: Enable
964-
965-
* - | ``MIOPEN_DEBUG_CONV_MLIR_IGEMM_BWD_XDLOPS``
966-
| Controls MLIR implicit GEMM backward XDLOPS solution.
967-
- | 0: Disable
968-
| 1: Enable
969-
970948
Attention and softmax control
971949
=============================
972950

projects/miopen/include/miopen/config.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#cmakedefine01 MIOPEN_DISABLE_SYSDB
2626
#cmakedefine01 MIOPEN_LOG_FUNC_TIME_ENABLE
2727
#cmakedefine01 MIOPEN_ENABLE_SQLITE_BACKOFF
28-
#cmakedefine01 MIOPEN_USE_MLIR
2928
#cmakedefine01 MIOPEN_USE_COMPOSABLEKERNEL
3029
#cmakedefine01 MIOPEN_BUILD_DRIVER
3130
#cmakedefine01 MIOPEN_ENABLE_AI_IMMED_MODE_FALLBACK

0 commit comments

Comments
 (0)