Skip to content

Commit b49e0eb

Browse files
committed
Revert "[mlir] Add config for PDL (llvm#69927)"
This reverts commit 5930725.
1 parent 5930725 commit b49e0eb

File tree

24 files changed

+1070
-1297
lines changed

24 files changed

+1070
-1297
lines changed

mlir/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ set(MLIR_ENABLE_NVPTXCOMPILER 0 CACHE BOOL
133133
"Statically link the nvptxlibrary instead of calling ptxas as a subprocess \
134134
for compiling PTX to cubin")
135135

136-
set(MLIR_ENABLE_PDL_IN_PATTERNMATCH 1 CACHE BOOL "Enable PDL in PatternMatch")
137-
138136
option(MLIR_INCLUDE_TESTS
139137
"Generate build targets for the MLIR unit tests."
140138
${LLVM_INCLUDE_TESTS})
@@ -180,9 +178,10 @@ include_directories( ${MLIR_INCLUDE_DIR})
180178
# Adding tools/mlir-tblgen here as calling add_tablegen sets some variables like
181179
# MLIR_TABLEGEN_EXE in PARENT_SCOPE which gets lost if that folder is included
182180
# from another directory like tools
181+
add_subdirectory(tools/mlir-tblgen)
183182
add_subdirectory(tools/mlir-linalg-ods-gen)
184183
add_subdirectory(tools/mlir-pdll)
185-
add_subdirectory(tools/mlir-tblgen)
184+
186185
set(MLIR_TABLEGEN_EXE "${MLIR_TABLEGEN_EXE}" CACHE INTERNAL "")
187186
set(MLIR_TABLEGEN_TARGET "${MLIR_TABLEGEN_TARGET}" CACHE INTERNAL "")
188187
set(MLIR_LINALG_ODS_YAML_GEN_TABLEGEN_EXE "${MLIR_LINALG_ODS_YAML_GEN_TABLEGEN_EXE}" CACHE INTERNAL "")

mlir/examples/minimal-opt/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Below are some example measurements taken at the time of the LLVM 17 release,
1414
using clang-14 on a X86 Ubuntu and [bloaty](https://github.com/google/bloaty).
1515

1616
| | Base | Os | Oz | Os LTO | Oz LTO |
17-
| :------------------------------: | ------ | ------ | ------ | ------ | ------ |
18-
| `mlir-cat` | 1024KB | 840KB | 885KB | 706KB | 657KB |
19-
| `mlir-minimal-opt` | 1.62MB | 1.32MB | 1.36MB | 1.17MB | 1.07MB |
20-
| `mlir-minimal-opt-canonicalize` | 1.83MB | 1.40MB | 1.45MB | 1.25MB | 1.14MB |
17+
| :-----------------------------: | ------ | ------ | ------ | ------ | ------ |
18+
| `mlir-cat` | 1018kB | 836KB | 879KB | 697KB | 649KB |
19+
| `mlir-minimal-opt` | 1.54MB | 1.25MB | 1.29MB | 1.10MB | 1.00MB |
20+
| `mlir-minimal-opt-canonicalize` | 2.24MB | 1.81MB | 1.86MB | 1.62MB | 1.48MB |
2121

2222
Base configuration:
2323

@@ -32,7 +32,6 @@ cmake ../llvm/ -G Ninja \
3232
-DCMAKE_CXX_COMPILER=clang++ \
3333
-DLLVM_ENABLE_LLD=ON \
3434
-DLLVM_ENABLE_BACKTRACES=OFF \
35-
-DMLIR_ENABLE_PDL_IN_PATTERNMATCH=OFF \
3635
-DCMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO=-Wl,-icf=all
3736
```
3837

mlir/include/mlir/Config/mlir-config.h.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,4 @@
2626
numeric seed that is passed to the random number generator. */
2727
#cmakedefine MLIR_GREEDY_REWRITE_RANDOMIZER_SEED ${MLIR_GREEDY_REWRITE_RANDOMIZER_SEED}
2828

29-
/* If set, enables PDL usage. */
30-
#cmakedefine01 MLIR_ENABLE_PDL_IN_PATTERNMATCH
31-
3229
#endif

mlir/include/mlir/Conversion/LLVMCommon/TypeConverter.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#define MLIR_CONVERSION_LLVMCOMMON_TYPECONVERTER_H
1616

1717
#include "mlir/Conversion/LLVMCommon/LoweringOptions.h"
18-
#include "mlir/IR/BuiltinTypes.h"
1918
#include "mlir/Transforms/DialectConversion.h"
2019

2120
namespace mlir {

mlir/include/mlir/Dialect/Vector/IR/VectorOps.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "mlir/Interfaces/SideEffectInterfaces.h"
3030
#include "mlir/Interfaces/VectorInterfaces.h"
3131
#include "mlir/Interfaces/ViewLikeInterface.h"
32-
#include "llvm/ADT/SetVector.h"
3332
#include "llvm/ADT/StringExtras.h"
3433

3534
// Pull in all enum type definitions and utility function declarations.

0 commit comments

Comments
 (0)