Skip to content
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

Jump to bottom

Support default configs for BATCH_MATMUL_* in MaterializeEncoding pass #14762

Merged
merged 1 commit into from
Aug 24, 2023
Merged

Support default configs for BATCH_MATMUL_* in MaterializeEncoding pass #14762

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
1 change: 1 addition & 0 deletions compiler/src/iree/compiler/Codegen/Common/CPU/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ iree_compiler_cc_library(
"//compiler/src/iree/compiler/Codegen/Utils",
"//compiler/src/iree/compiler/Dialect/HAL/IR",
"//llvm-external-projects/iree-dialects:IREELinalgExtDialect",
"//llvm-external-projects/iree-dialects:IREELinalgExtEncodingUtils",
"//llvm-external-projects/iree-dialects:IREELinalgExtTransforms",
"//llvm-external-projects/iree-dialects:IREELinalgExtUtils",
"@llvm-project//llvm:Support",
Expand Down
1 change: 1 addition & 0 deletions compiler/src/iree/compiler/Codegen/Common/CPU/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ iree_cc_library(
::PassHeaders
::PassesIncGen
IREELinalgExtDialect
IREELinalgExtEncodingUtils
IREELinalgExtTransforms
IREELinalgExtUtils
LLVMSupport
Expand Down
4 changes: 3 additions & 1 deletion compiler/src/iree/compiler/Codegen/Common/CPU/CPUMaterializeEncodingPass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtDialect.h"
#include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtOps.h"
#include "iree-dialects/Dialect/LinalgExt/Passes/Passes.h"
#include "iree-dialects/Dialect/LinalgExt/Utils/EncodingUtils.h"
#include "iree-dialects/Dialect/LinalgExt/Utils/Utils.h"
#include "iree/compiler/Codegen/Common/CPU/PassDetail.h"
#include "iree/compiler/Codegen/Common/CPU/Passes.h"
Expand Down Expand Up @@ -171,7 +172,8 @@ materializeEncodingForTarget(RankedTensorType tensorType,
auto user = encoding.getUser().getValue();
auto role = encoding.getRole().getValue();
MatmulTileParams tileParams = chooseMatmulTileParams(user, targetAttr);
auto encodingInfo = chooseEncodingInfoForMatmul(user, role, tileParams);
auto encodingInfo =
IREE::LinalgExt::chooseEncodingInfoForMatmul(user, role, tileParams);
auto originalTypeAttr = encoding.getOriginalType();
auto originalType = originalTypeAttr
? originalTypeAttr.getValue().cast<RankedTensorType>()
Expand Down
11 changes: 0 additions & 11 deletions compiler/src/iree/compiler/Codegen/Common/EncodingInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,10 @@
namespace mlir {
namespace iree_compiler {

struct MatmulTileParams {
int64_t M = 1;
int64_t K = 1;
int64_t N = 1;
};

void adjustTileSizesToNarrowStaticShape(
IREE::LinalgExt::MaterializeEncodingInfo &encodingInfo,
ArrayRef<int64_t> shape);

IREE::LinalgExt::MaterializeEncodingInfo
chooseEncodingInfoForMatmul(IREE::LinalgExt::EncodingUser user,
IREE::LinalgExt::EncodingRole role,
MatmulTileParams tileParams);

IREE::LinalgExt::MaterializeEncodingValueFn
getMaterializeEncodingValueFn(IREE::HAL::ExecutableTargetAttr targetAttr);

Expand Down
46 changes: 0 additions & 46 deletions compiler/src/iree/compiler/Codegen/Common/MaterializeEncodingIntoPackUnPack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,52 +269,6 @@ struct MaterializeFlowDispatchTensorStoreOp

} // namespace

IREE::LinalgExt::MaterializeEncodingInfo
chooseEncodingInfoForMatmul(EncodingUser user, EncodingRole role,
MatmulTileParams tileParams) {
// Start dim of the MxK (LHS), KxN (RHS), or MxN (RESULT) 2D matrix.
int64_t matmulDimBase = 0;
switch (user) {
case EncodingUser::BATCH_MATMUL_F32F32F32:
case EncodingUser::BATCH_MATMUL_F16F16F32:
case EncodingUser::BATCH_MATMUL_F16F16F16:
case EncodingUser::BATCH_MATMUL_BF16BF16F32:
case EncodingUser::BATCH_MATMUL_BF16BF16BF16:
case EncodingUser::BATCH_MATMUL_I8I8I32:
matmulDimBase = 1;
break;
default:
break;
}

MaterializeEncodingInfo encodingInfo;
encodingInfo.innerDimsPos = {matmulDimBase, matmulDimBase + 1};
switch (role) {
case (EncodingRole::LHS): {
encodingInfo.innerTileSizes = {tileParams.M, tileParams.K};
break;
}
case (EncodingRole::RHS): {
encodingInfo.innerTileSizes = {tileParams.N, tileParams.K};
encodingInfo.innerDimsPos = {matmulDimBase + 1, matmulDimBase};
encodingInfo.outerDimsPerm =
llvm::to_vector(llvm::seq<int64_t>(0, matmulDimBase));
encodingInfo.outerDimsPerm.push_back(matmulDimBase + 1);
encodingInfo.outerDimsPerm.push_back(matmulDimBase);
break;
}
case (EncodingRole::RESULT): {
encodingInfo.innerTileSizes = {tileParams.M, tileParams.N};
break;
}
default: {
assert(false);
return {};
}
}
return encodingInfo;
}

void adjustTileSizesToNarrowStaticShape(MaterializeEncodingInfo &encodingInfo,
ArrayRef<int64_t> shape) {
for (size_t i = 0; i < encodingInfo.innerDimsPos.size(); i++) {
Expand Down
29 changes: 23 additions & 6 deletions llvm-external-projects/iree-dialects/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,12 +312,13 @@ gentbl_cc_library(

cc_library(
name = "IREELinalgExtUtils",
srcs = glob([
"lib/Dialect/LinalgExt/Utils/*.cpp",
]),
hdrs = glob([
"include/iree-dialects/Dialect/LinalgExt/Utils/*.h",
]),
srcs = [
"lib/Dialect/LinalgExt/Utils/Utils.cpp",
],
hdrs = [
"include/iree-dialects/Dialect/LinalgExt/Utils/Utils.h",
"include/iree-dialects/Dialect/LinalgExt/Utils/WinogradConstants.h",
],
includes = ["include"],
deps = [
"@llvm-project//llvm:Support",
Expand All @@ -331,6 +332,21 @@ cc_library(
],
)

cc_library(
name = "IREELinalgExtEncodingUtils",
srcs = [
"lib/Dialect/LinalgExt/Utils/EncodingUtils.cpp",
],
hdrs = [
"include/iree-dialects/Dialect/LinalgExt/Utils/EncodingUtils.h",
],
includes = ["include"],
deps = [
":IREELinalgExtDialect",
":IREELinalgExtUtils",
],
)

cc_library(
name = "IREELinalgExtDialect",
srcs = glob([
Expand Down Expand Up @@ -437,6 +453,7 @@ cc_library(
deps = [
":IREEInputDialect",
":IREELinalgExtDialect",
":IREELinalgExtEncodingUtils",
":IREELinalgExtPassIncGen",
":IREELinalgExtUtils",
"@llvm-project//llvm:Support",
Expand Down
33 changes: 33 additions & 0 deletions ...rnal-projects/iree-dialects/include/iree-dialects/Dialect/LinalgExt/Utils/EncodingUtils.h
View file
Open in desktop
Copy link
Contributor Author

@pzread pzread Aug 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was trying to add this code in to LinalgExt/Utils/Utils.h, but LinalgExt/Utils/Utils.h is used in LinalgExt/IR/LinalgExtOps.cpp. And we need to use linalg_ext ops, which results in cyclic library dependencies.

I'm not sure what the better way is to solve this. Here I simply creates a separate utils library.

If I put this code into LinalgExt/Utils/Utils.h and add IREELinalgExtDialect to the dependencies of IREELinalgExtUtils, I'll get the error:

CMake Error: The inter-target dependency graph contains the following strongly connected component (cycle):
  "obj.IREELinalgExtDialect" of type OBJECT_LIBRARY
  depends on "IREELinalgExtUtils" (strong)
  "IREELinalgExtDialect" of type STATIC_LIBRARY
  depends on "obj.IREELinalgExtDialect" (strong)
  depends on "IREELinalgExtUtils" (strong)
  "obj.IREELinalgExtUtils" of type OBJECT_LIBRARY
  depends on "IREELinalgExtDialect" (strong)
  "IREELinalgExtUtils" of type STATIC_LIBRARY
  depends on "IREELinalgExtDialect" (strong)
  depends on "obj.IREELinalgExtUtils" (strong)
  
At least one of these targets is not a STATIC_LIBRARY.  Cyclic dependencies are allowed only among static libraries.
CMake Generate step failed.  Build files cannot be regenerated correctly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WHy does Utils needs IR ?

Copy link
Contributor Author

@pzread pzread Aug 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new code added here needs IREE::LinalgExt::EncodingUser, which is defined in LinalgExt/IR/LinalgExtOps.h. So if we add the code into LinalgExt/Utils/Utils.h instead, IIUC IREELinalgExtUtils will have a dependency to IREELinalgExtDialect.

On the other hand, LinalgExtOps.cpp is using getDimValue and computeInterchangeFromDimPos defined in Utils.cpp, so it currently has a dependecy to IREELinalgExtUtils

https://github.com/openxla/iree/blob/5142828f9d6fb761c98900e45f4e398c6da9af6d/llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/IR/CMakeLists.txt#L12-L13

Copy link
Contributor Author

@pzread pzread Aug 21, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To clarify, here I'm trying to move chooseEncodingInfoForMatmul from IREE codegen into LinalgExt so we can reuse the same logic to choose tiling and permutations for materialization based on LinExt::EncodingUser.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've seen similar issues in MLIR repo. I think the solution is that *IR should not depends on *Util. The common methods are moved to *IR.h in upstream, and we can probably follow the convention. Dependency issue looks fine to me, and we can refactor it later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MaheshRavishankar Kindly ping : ) Do you have further comments on this PR?

Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright 2023 The IREE Authors
//
// Licensed under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef IREE_DIALECTS_DIALECT_LINALGEXT_UTILS_ENCODING_UTILS_H_
#define IREE_DIALECTS_DIALECT_LINALGEXT_UTILS_ENCODING_UTILS_H_

#include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtOps.h"
#include "iree-dialects/Dialect/LinalgExt/Utils/Utils.h"

namespace mlir {
namespace iree_compiler {
namespace IREE {
namespace LinalgExt {

struct MatmulTileParams {
int64_t M = 1;
int64_t K = 1;
int64_t N = 1;
};

MaterializeEncodingInfo
chooseEncodingInfoForMatmul(EncodingUser user, EncodingRole role,
MatmulTileParams tileParams);

} // namespace LinalgExt
} // namespace IREE
} // namespace iree_compiler
} // namespace mlir

#endif // IREE_DIALECTS_DIALECT_LINALGEXT_UTILS_ENCODING_UTILS_H_
1 change: 1 addition & 0 deletions llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Passes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ add_mlir_library(IREELinalgExtPasses
LINK_LIBS PUBLIC
IREEInputDialect
IREELinalgExtDialect
IREELinalgExtEncodingUtils
IREELinalgExtUtils
MLIRAffineDialect
MLIRIR
Expand Down
29 changes: 17 additions & 12 deletions llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Passes/MaterializeEncoding.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "iree-dialects/Dialect/LinalgExt/IR/LinalgExtOps.h"
#include "iree-dialects/Dialect/LinalgExt/Passes/PassDetail.h"
#include "iree-dialects/Dialect/LinalgExt/Passes/Passes.h"
#include "iree-dialects/Dialect/LinalgExt/Utils/EncodingUtils.h"
#include "iree-dialects/Dialect/LinalgExt/Utils/Utils.h"
#include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Arith/IR/Arith.h"
Expand Down Expand Up @@ -89,19 +90,23 @@ chooseEncodingInfo(RankedTensorType tensorType) {
auto encoding = getEncodingAttr(tensorType);
if (!encoding)
return failure();

auto user = encoding.getUser().getValue();
auto role = encoding.getRole().getValue();
switch (role) {
case EncodingRole::LHS:
return MaterializeEncodingInfo{{0, 1}, {8, 4}, {}};
break;
case EncodingRole::RHS:
return MaterializeEncodingInfo{{1, 0}, {8, 4}, {1, 0}};
break;
case EncodingRole::RESULT:
return MaterializeEncodingInfo{{0, 1}, {8, 8}, {}};
break;
default:
return failure();
switch (user) {
case EncodingUser::MATMUL_F32F32F32:
case EncodingUser::MATMUL_F16F16F32:
case EncodingUser::MATMUL_F16F16F16:
case EncodingUser::MATMUL_BF16BF16F32:
case EncodingUser::MATMUL_BF16BF16BF16:
case EncodingUser::MATMUL_I8I8I32:
case EncodingUser::BATCH_MATMUL_F32F32F32:
case EncodingUser::BATCH_MATMUL_F16F16F32:
case EncodingUser::BATCH_MATMUL_F16F16F16:
case EncodingUser::BATCH_MATMUL_BF16BF16F32:
case EncodingUser::BATCH_MATMUL_BF16BF16BF16:
case EncodingUser::BATCH_MATMUL_I8I8I32:
return chooseEncodingInfoForMatmul(user, role, /*tileParams=*/{8, 4, 8});
}
}

Expand Down
8 changes: 8 additions & 0 deletions llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ add_mlir_library(IREELinalgExtUtils
MLIRTensorDialect
MLIRMemRefDialect
)

add_mlir_library(IREELinalgExtEncodingUtils
EncodingUtils.cpp

LINK_LIBS PUBLIC
IREELinalgExtDialect
IREELinalgExtUtils
)
63 changes: 63 additions & 0 deletions llvm-external-projects/iree-dialects/lib/Dialect/LinalgExt/Utils/EncodingUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// Copyright 2023 The IREE Authors
//
// Licensed under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include "iree-dialects/Dialect/LinalgExt/Utils/EncodingUtils.h"

namespace mlir {
namespace iree_compiler {
namespace IREE {
namespace LinalgExt {

MaterializeEncodingInfo
chooseEncodingInfoForMatmul(EncodingUser user, EncodingRole role,
MatmulTileParams tileParams) {
// Start dim of the MxK (LHS), KxN (RHS), or MxN (RESULT) 2D matrix.
int64_t matmulDimBase = 0;
switch (user) {
case EncodingUser::BATCH_MATMUL_F32F32F32:
case EncodingUser::BATCH_MATMUL_F16F16F32:
case EncodingUser::BATCH_MATMUL_F16F16F16:
case EncodingUser::BATCH_MATMUL_BF16BF16F32:
case EncodingUser::BATCH_MATMUL_BF16BF16BF16:
case EncodingUser::BATCH_MATMUL_I8I8I32:
matmulDimBase = 1;
break;
default:
break;
}

MaterializeEncodingInfo encodingInfo;
encodingInfo.innerDimsPos = {matmulDimBase, matmulDimBase + 1};
switch (role) {
case (EncodingRole::LHS): {
encodingInfo.innerTileSizes = {tileParams.M, tileParams.K};
break;
}
case (EncodingRole::RHS): {
encodingInfo.innerTileSizes = {tileParams.N, tileParams.K};
encodingInfo.innerDimsPos = {matmulDimBase + 1, matmulDimBase};
encodingInfo.outerDimsPerm =
llvm::to_vector(llvm::seq<int64_t>(0, matmulDimBase));
encodingInfo.outerDimsPerm.push_back(matmulDimBase + 1);
encodingInfo.outerDimsPerm.push_back(matmulDimBase);
break;
}
case (EncodingRole::RESULT): {
encodingInfo.innerTileSizes = {tileParams.M, tileParams.N};
break;
}
default: {
assert(false);
return {};
}
}
return encodingInfo;
}

} // namespace LinalgExt
} // namespace IREE
} // namespace iree_compiler
} // namespace mlir
Loading
Loading