[NFC] Internalize getMaterializeEncodingValueFn method to where it is used. (#15871)
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/CPUMaterializeEncodingPass.cpp b/compiler/src/iree/compiler/Codegen/Common/CPU/CPUMaterializeEncodingPass.cpp
index 7f96a75..6a32b7d 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/CPUMaterializeEncodingPass.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/CPUMaterializeEncodingPass.cpp
@@ -10,6 +10,7 @@
#include "iree/compiler/Codegen/Common/CPU/Passes.h"
#include "iree/compiler/Codegen/Common/EncodingUtils.h"
#include "iree/compiler/Codegen/Dialect/IREECodegenDialect.h"
+#include "iree/compiler/Codegen/Dialect/IREECodegenOps.h"
#include "iree/compiler/Codegen/Utils/Utils.h"
#include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
#include "llvm/ADT/STLExtras.h"
@@ -505,6 +506,25 @@
};
}
+static FailureOr<MaterializeEncodingValueInfo>
+chooseDynamicEncodingInfoVMVXMicrokernels(RankedTensorType tensorType,
+ OpBuilder &builder, Location loc) {
+ SmallVector<Type> resultTypes(tensorType.getRank(), builder.getIndexType());
+ auto op = builder.create<IREE::Codegen::QueryTileSizesOp>(
+ loc, resultTypes, TypeAttr::get(tensorType));
+ MaterializeEncodingValueInfo result;
+ result.innerTileSizes = op.getResults();
+ return result;
+}
+
+static MaterializeEncodingValueFn
+getMaterializeEncodingValueFn(IREE::HAL::ExecutableTargetAttr targetAttr) {
+ if (isVMVXBackend(targetAttr) && hasUkernel(targetAttr)) {
+ return chooseDynamicEncodingInfoVMVXMicrokernels;
+ }
+ return {};
+}
+
void CPUMaterializeEncodingPass::runOnOperation() {
MLIRContext *context = &getContext();
auto operation = getOperation();
diff --git a/compiler/src/iree/compiler/Codegen/Common/EncodingUtils.h b/compiler/src/iree/compiler/Codegen/Common/EncodingUtils.h
index 4156c63..fca436d 100644
--- a/compiler/src/iree/compiler/Codegen/Common/EncodingUtils.h
+++ b/compiler/src/iree/compiler/Codegen/Common/EncodingUtils.h
@@ -116,9 +116,6 @@
getEncodingInfoForMatmul(IREE::LinalgExt::EncodingAttr encoding, int64_t rank,
TileMxNxK tileMxNxK);
-MaterializeEncodingValueFn
-getMaterializeEncodingValueFn(IREE::HAL::ExecutableTargetAttr targetAttr);
-
void populateMaterializeEncodingIntoPackUnPackPatterns(
RewritePatternSet &patterns, MaterializeEncodingConversionTarget &target,
MaterializeEncodingTypeConverter &typeConverter,
diff --git a/compiler/src/iree/compiler/Codegen/Common/MaterializeEncodingIntoPackUnPack.cpp b/compiler/src/iree/compiler/Codegen/Common/MaterializeEncodingIntoPackUnPack.cpp
index d460feb..7125fca 100644
--- a/compiler/src/iree/compiler/Codegen/Common/MaterializeEncodingIntoPackUnPack.cpp
+++ b/compiler/src/iree/compiler/Codegen/Common/MaterializeEncodingIntoPackUnPack.cpp
@@ -13,7 +13,6 @@
#include "iree/compiler/Codegen/Common/EncodingUtils.h"
#include "iree/compiler/Codegen/Common/PassDetail.h"
#include "iree/compiler/Codegen/Common/Passes.h"
-#include "iree/compiler/Codegen/Dialect/IREECodegenOps.h"
#include "iree/compiler/Codegen/Utils/Utils.h"
#include "iree/compiler/Dialect/Flow/IR/FlowOps.h"
#include "iree/compiler/Dialect/HAL/IR/HALTypes.h"
@@ -871,25 +870,6 @@
} // namespace
-static FailureOr<MaterializeEncodingValueInfo>
-chooseDynamicEncodingInfoVMVXMicrokernels(RankedTensorType tensorType,
- OpBuilder &builder, Location loc) {
- SmallVector<Type> resultTypes(tensorType.getRank(), builder.getIndexType());
- auto op = builder.create<IREE::Codegen::QueryTileSizesOp>(
- loc, resultTypes, TypeAttr::get(tensorType));
- MaterializeEncodingValueInfo result;
- result.innerTileSizes = op.getResults();
- return result;
-}
-
-MaterializeEncodingValueFn
-getMaterializeEncodingValueFn(IREE::HAL::ExecutableTargetAttr targetAttr) {
- if (isVMVXBackend(targetAttr) && hasUkernel(targetAttr)) {
- return chooseDynamicEncodingInfoVMVXMicrokernels;
- }
- return {};
-}
-
void populateMaterializeEncodingIntoPackUnPackPatterns(
RewritePatternSet &patterns, MaterializeEncodingConversionTarget &target,
MaterializeEncodingTypeConverter &typeConverter,
