Skip to content

Commit

Permalink
bump LLVM to acc6f3e9c1af6c7445aae6f10d4b016ac84112d3 (#15296)
Browse files Browse the repository at this point in the history 
llvm/llvm-project#70218 just missed the last
integrate, and cherry-picks are frowned upon.

The good thing with just missing an integrate is that just bumping the
submodule shouldn't be too hard still. I just had to fix up one small
thing in CollapseDimensions.


ci-extra:build_test_all_windows,build_test_all_macos_arm64,build_test_all_macos_x86_64
  • Loading branch information
@bjacob
bjacob authored Oct 27, 2023
1 parent e329737 commit 11debb4
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 29 deletions.
10 changes: 8 additions & 2 deletions compiler/src/iree/compiler/Codegen/Common/MaterializeUserConfigs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,15 @@ struct MaterializeUserConfigsPass
/// the same time. Because the strategy is rooted on the variant op, the
/// strategy can change the translation info on the exports if needed, else
/// back to default IREE codegen.
StringRef entryPoint = libraryFunc->getLeafReference();
Operation *transformRoot = transform::detail::findTransformEntryPoint(
variantOp, *transformLibrary, entryPoint);
if (!transformRoot) {
return;
}
if (failed(transform::applyTransformNamedSequence(
variantOp, *transformLibrary, options.enableExpensiveChecks(true),
libraryFunc->getLeafReference()))) {
variantOp, transformRoot, *transformLibrary,
options.enableExpensiveChecks(true)))) {
return signalPassFailure();
}

Expand Down
5 changes: 3 additions & 2 deletions compiler/src/iree/compiler/Codegen/LLVMCPU/DispatchABI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1011,7 +1011,8 @@ Value HALDispatchABI::loadExecutableConstant(Operation *forOp, StringRef key,

// Load the placeholder global ordinal.
Value globalPtr = builder.create<LLVM::AddressOfOp>(loc, globalOp);
Value ordinalValue = builder.create<LLVM::LoadOp>(loc, globalPtr);
Value ordinalValue =
builder.create<LLVM::LoadOp>(loc, globalOp.getType(), globalPtr);

// Load constant from the executable constants struct.
auto constantsPtrValue =
Expand Down Expand Up @@ -1051,7 +1052,7 @@ Value HALDispatchABI::loadImportOrdinal(Operation *forOp, StringRef importName,

// Load the placeholder global ordinal.
Value globalPtr = builder.create<LLVM::AddressOfOp>(loc, globalOp);
return builder.create<LLVM::LoadOp>(loc, globalPtr);
return builder.create<LLVM::LoadOp>(loc, globalOp.getType(), globalPtr);
}

std::pair<Value, Value> HALDispatchABI::loadImportFunc(Operation *forOp,
Expand Down
2 changes: 1 addition & 1 deletion compiler/src/iree/compiler/Codegen/LLVMCPU/test/hal_executable_constants.mlir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// CHECK-DAG: llvm.mlir.global internal @__constant_ordinal_foo() {{.+}}hal.executable.constant.key = "foo"{{.+}} : i32
// CHECK-LABEL: llvm.func @constant_values
func.func @constant_values() {
// CHECK: %[[FOO_ORDINAL_PTR:.+]] = llvm.mlir.addressof @__constant_ordinal_foo : !llvm.ptr<i32>
// CHECK: %[[FOO_ORDINAL_PTR:.+]] = llvm.mlir.addressof @__constant_ordinal_foo : !llvm.ptr
// CHECK: %[[FOO_ORDINAL:.+]] = llvm.load %[[FOO_ORDINAL_PTR]]
// CHECK: %[[FOO_PTR:.+]] = llvm.getelementptr %{{.+}}[%[[FOO_ORDINAL]]]
// CHECK: %[[FOO:.+]] = llvm.load %[[FOO_PTR]]
Expand Down
3 changes: 1 addition & 2 deletions compiler/src/iree/compiler/Codegen/LLVMGPU/ConvertToLLVM.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ void ConvertToDynamicSharedMemory(ModuleOp moduleOp) {
loc, IntegerType::get(builder.getContext(), 64),
builder.getI64IntegerAttr(offset));
Value shiftedPtr = builder.create<LLVM::GEPOp>(
loc, globalPtr.getType(),
LLVM::LLVMPointerType::get(globalOp.getContext()), globalPtr,
loc, globalPtr.getType(), global.getGlobalType(), globalPtr,
ValueRange({zero, offsetValue}));
addressOfOp.replaceAllUsesWith(shiftedPtr);
addressOfOp.erase();
Expand Down
26 changes: 13 additions & 13 deletions compiler/src/iree/compiler/Codegen/LLVMGPU/test/convert_to_nvvm.mlir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,18 +212,18 @@ hal.executable @shared_memory_lowering {
}
// CHECK: llvm.mlir.global external @__dynamic_shared_memory__() {addr_space = 3 : i32, alignment = 16 : i64} : !llvm.array<0 x i8>
// CHECK-LABEL: llvm.func @shared_memory_lowering() {
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(2048 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(4096 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>

// -----

Expand All @@ -240,7 +240,7 @@ hal.executable @shared_memory_dealloc_elision {
func.func @shared_memory_dealloc_elision() {
%f0 = arith.constant 0.0 : f32
%c0 = arith.constant 0 : index
// CHECK: llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK: llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
%0 = memref.alloc() : memref<1xf32, #gpu.address_space<workgroup>>
memref.store %f0, %0[%c0] : memref<1xf32, #gpu.address_space<workgroup>>
// CHECK-NOT: free
Expand Down Expand Up @@ -277,14 +277,14 @@ hal.executable @shared_memory_lowering_aligned_alloc {
}
// CHECK-LABEL: llvm.mlir.global external @__dynamic_shared_memory__() {addr_space = 3 : i32, alignment = 16 : i64} : !llvm.array<0 x i8>
// CHECK-LABEL: llvm.func @shared_memory_lowering_aligned_alloc() {
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(4 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>

// -----

Expand Down Expand Up @@ -392,7 +392,7 @@ hal.executable @shared_memory_lowering_index {
}
// CHECK: llvm.mlir.global external @__dynamic_shared_memory__() {addr_space = 3 : i32, alignment = 16 : i64} : !llvm.array<0 x i8>
// CHECK-LABEL: llvm.func @shared_memory_lowering_index() {
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<array<0 x i8>, 3>
// CHECK: %{{.*}} = llvm.mlir.addressof @__dynamic_shared_memory__ : !llvm.ptr<3>
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.mlir.constant(0 : i64) : i64
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<array<0 x i8>, 3>, i64, i64) -> !llvm.ptr<array<0 x i8>, 3>
// CHECK-NEXT: %{{.*}} = llvm.getelementptr %{{.*}} : (!llvm.ptr<3>, i64, i64) -> !llvm.ptr<3>
4 changes: 2 additions & 2 deletions compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseDimensions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@ static bool collapseDimensions(IRRewriter &rewriter,
rewriter.setInsertionPoint(genericOp.value());

FailureOr<SmallVector<Value>> maybeReplacements =
mlir::linalg::collapseGenericOpIterationDims(genericOp.value(),
collapseIndices, rewriter);
mlir::linalg::collapseOpIterationDims(genericOp.value(), collapseIndices,
rewriter);
if (failed(maybeReplacements))
return false;
rewriter.replaceOp(genericOp.value(), maybeReplacements.value());
Expand Down
9 changes: 5 additions & 4 deletions compiler/src/iree/compiler/Dialect/Flow/Transforms/CollapseReductionDims.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "iree/compiler/Dialect/Flow/Transforms/Passes.h"
#include "iree/compiler/Dialect/Flow/Transforms/RegionOpUtils.h"
#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/IR/LinalgInterfaces.h"
#include "mlir/Dialect/Linalg/Transforms/Transforms.h"
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"

Expand Down Expand Up @@ -44,19 +45,19 @@ static bool hasContiguousDims(AffineMap map, ArrayRef<unsigned> dims) {
}

static SmallVector<ReassociationIndices>
collapseDimensions(linalg::GenericOp genericOp) {
collapseDimensions(linalg::LinalgOp linalgOp) {
SmallVector<ReassociationIndices> collapseIndices;

if (!isNonNullAndOutsideDispatch(genericOp)) {
if (!isNonNullAndOutsideDispatch(linalgOp)) {
return collapseIndices;
}

SmallVector<unsigned> reductionDims;
genericOp.getReductionDims(reductionDims);
linalgOp.getReductionDims(reductionDims);
if (reductionDims.size() < 2)
return collapseIndices;

for (AffineMap map : genericOp.getIndexingMapsArray()) {
for (AffineMap map : linalgOp.getIndexingMapsArray()) {
if (!hasContiguousDims(map, reductionDims))
return collapseIndices;
}
Expand Down
5 changes: 4 additions & 1 deletion compiler/src/iree/compiler/InputConversion/TOSA/Passes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ void buildTOSAInputConversionPassPipeline(OpPassManager &passManager) {
iree_compiler::createTosaToLinalgExt());
passManager.addNestedPass<func::FuncOp>(mlir::createCanonicalizerPass());

tosa::addTosaToLinalgPasses(passManager, TosaToLinalgOptions());
TosaToLinalgNamedOptions tosaToLinalgNamedOptions;
tosaToLinalgNamedOptions.preferConv2DKernelLayoutHWCF = true;
tosa::addTosaToLinalgPasses(passManager, TosaToLinalgOptions(),
tosaToLinalgNamedOptions);
passManager.addNestedPass<func::FuncOp>(
iree_compiler::createConverti48Toi64());

Expand Down
2 changes: 1 addition & 1 deletion llvm-external-projects/iree-dialects/test/Dialect/iree_linalg_ext/decompose_softmax.mlir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ func.func @softmax(%arg0: tensor<2x16x32xf32>) -> tensor<2x16x32xf32> {
// CHECK: func.func @softmax(%[[ARG0:[a-zA-Z0-9_]+]]: tensor<2x16x32xf32>) -> tensor<2x16x32xf32> {
// CHECK: %[[D0:.+]] = tensor.empty() : tensor<2x16x32xf32>
// CHECK: %[[D1:.+]] = tensor.empty() : tensor<2x16xf32>
// CHECK: %[[CST:.+]] = arith.constant -1.401300e-45 : f32
// CHECK: %[[CST:.+]] = arith.constant -3.40282347E+38 : f32
// CHECK: %[[D2:.+]] = linalg.fill ins(%[[CST]] : f32) outs(%[[D1]] : tensor<2x16xf32>) -> tensor<2x16xf32>
// CHECK: %[[D3:.+]] = linalg.generic {indexing_maps = [#[[MAP]], #[[MAP1]]], iterator_types = ["parallel",
// CHECK-SAME: "parallel", "reduction"]} ins(%[[ARG0]] : tensor<2x16x32xf32>) outs(%[[D2]] : tensor<2x16xf32>) {
Expand Down
2 changes: 1 addition & 1 deletion third_party/llvm-project
Submodule llvm-project updated from 6aaa03 to acc6f3

0 comments on commit 11debb4

Please sign in to comment.