Skip to content

Commit 15dff71

Browse files
committed
Revert "[mlir][Affine] Handle null parent op in getAffineParallelInductionVarOwner (#142025)"
This reverts commit c3746ff. This breaks build with BUILD_SHARED_LIBS=ON. ``` /usr/bin/ld: CMakeFiles/MLIRTestMemRefToLLVMWithTransforms.dir/TestMemRefToLLVMWithTransforms.cpp.o: in function `(anonymous namespace)::TestMemRefToLLVMWithTransforms::runOnOperation()': TestMemRefToLLVMWithTransforms.cpp:(.text._ZN12_GLOBAL__N_130TestMemRefToLLVMWithTransforms14runOnOperationEv+0x68): undefined reference to `mlir::LowerToLLVMOptions::LowerToLLVMOptions(mlir::MLIRContext*)' /usr/bin/ld: TestMemRefToLLVMWithTransforms.cpp:[ 88%] Built target CodeGenTests (.text._ZN12_GLOBAL__N_130TestMemRefToLLVMWithTransforms14runOnOperationEvmake[2]: Leaving directory '/work2/kparzysz/git/llvm.org/b/x86' +0x80): undefined reference to `mlir::LLVMTypeConverter::LLVMTypeConverter(mlir::MLIRContext*, mlir::LowerToLLVMOptions const&, mlir::DataLayoutAnalysis const*)' /usr/bin/ld: TestMemRefToLLVMWithTransforms.cpp:(.text._ZN12_GLOBAL__N_130TestMemRefToLLVMWithTransforms14runOnOperationEv+0x143): undefined reference to `mlir::populateFuncToLLVMConversionPatterns(mlir::LLVMTypeConverter const&, mlir::RewritePatternSet&, mlir::SymbolTable const*)' /usr/bin/ld: TestMemRefToLLVMWithTransforms.cpp:(.text._ZN12_GLOBAL__N_130TestMemRefToLLVMWithTransforms14runOnOperationEv+0x174): undefined reference to `mlir::LLVMConversionTarget::LLVMConversionTarget(mlir::MLIRContext&)' ```
1 parent d31ace4 commit 15dff71

File tree

7 files changed

+1
-98
lines changed

7 files changed

+1
-98
lines changed

mlir/lib/Dialect/Affine/IR/AffineOps.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2667,7 +2667,7 @@ AffineParallelOp mlir::affine::getAffineParallelInductionVarOwner(Value val) {
26672667
if (!ivArg || !ivArg.getOwner())
26682668
return nullptr;
26692669
Operation *containingOp = ivArg.getOwner()->getParentOp();
2670-
auto parallelOp = dyn_cast_if_present<AffineParallelOp>(containingOp);
2670+
auto parallelOp = dyn_cast<AffineParallelOp>(containingOp);
26712671
if (parallelOp && llvm::is_contained(parallelOp.getIVs(), val))
26722672
return parallelOp;
26732673
return nullptr;

mlir/test/Conversion/MemRefToLLVM/memref-to-llvm-with-transforms.mlir

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
add_subdirectory(ConvertToSPIRV)
22
add_subdirectory(FuncToLLVM)
33
add_subdirectory(MathToVCIX)
4-
add_subdirectory(MemRefToLLVM)
54
add_subdirectory(VectorToSPIRV)

mlir/test/lib/Conversion/MemRefToLLVM/CMakeLists.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

mlir/test/lib/Conversion/MemRefToLLVM/TestMemRefToLLVMWithTransforms.cpp

Lines changed: 0 additions & 62 deletions
This file was deleted.

mlir/tools/mlir-opt/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ if(MLIR_INCLUDE_TESTS)
2828
MLIRMathTestPasses
2929
MLIRTestMathToVCIX
3030
MLIRMemRefTestPasses
31-
MLIRTestMemRefToLLVMWithTransforms
3231
MLIRMeshTest
3332
MLIRNVGPUTestPasses
3433
MLIRSCFTestPasses

mlir/tools/mlir-opt/mlir-opt.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ void registerTestMathToVCIXPass();
130130
void registerTestIrdlTestDialectConversionPass();
131131
void registerTestMemRefDependenceCheck();
132132
void registerTestMemRefStrideCalculation();
133-
void registerTestMemRefToLLVMWithTransforms();
134133
void registerTestMeshReshardingSpmdizationPass();
135134
void registerTestMeshSimplificationsPass();
136135
void registerTestMultiBuffering();
@@ -276,7 +275,6 @@ void registerTestPasses() {
276275
mlir::test::registerTestMathToVCIXPass();
277276
mlir::test::registerTestMemRefDependenceCheck();
278277
mlir::test::registerTestMemRefStrideCalculation();
279-
mlir::test::registerTestMemRefToLLVMWithTransforms();
280278
mlir::test::registerTestMeshReshardingSpmdizationPass();
281279
mlir::test::registerTestMeshSimplificationsPass();
282280
mlir::test::registerTestMultiBuffering();

0 commit comments

Comments
 (0)