Skip to content

[Transform][Fusion] align file name with upstream #348

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.

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

Merged
merged 2 commits into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/gc/Transforms/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ gc_add_mlir_library(GcPasses
MemRefToCPURuntime.cpp
OneDNNGraphToLinalg.cpp
Pipeline.cpp
TileUsingInterfaceX.cpp
IterativeTilingAndFusion.cpp
TilingUsingInterfaceX.cpp
VerifyTargetDescription.cpp
DecomposeAggregatedOps.cpp
DeepTileContractionOp.cpp
Expand Down
2 changes: 1 addition & 1 deletion lib/gc/Transforms/IterativeTilingAndFusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include <memory>
#include <unordered_map>

#include "TilingUsingInterfaceX.h"
#include "TileUsingInterfaceX.h"

namespace mlir {
namespace gc {
Expand Down
4 changes: 2 additions & 2 deletions lib/gc/Transforms/Pipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ void populateTensorPasses(mlir::OpPassManager &pm) {
// linalg.matmul lowering to (scf.loop + linalg.brgemm) pass
pm.addNestedPass<func::FuncOp>(createDeepTileContractionOp());

// Fine-grain fusion pass
// fine-grain fusion pass
pm.addNestedPass<func::FuncOp>(createIterativeTilingAndFusion());
// todo: fine-grain fusion pass

pm.addNestedPass<func::FuncOp>(
mlir::microkernel::createConvertLinalgToMicrokernel());
// todo: lower linalg to arith/math on virtual vector pass
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//===-- TilingUsingInterfaceX.cpp - upstream eXtension ---------*- C++ -*-===//
//===-- TileUsingInterfaceX.cpp - upstream eXtension ------------*- C++ -*-===//
//
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
Expand Down Expand Up @@ -26,7 +26,7 @@
#include "llvm/Support/Debug.h"
#include <optional>

#include "TilingUsingInterfaceX.h"
#include "TileUsingInterfaceX.h"

#define DEBUG_TYPE "tile-using-interface-x"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//===-- TilingUsingInterfaceX.h - upstream eXtension -----------*- C++ -*-===//
//===-- TileUsingInterfaceX.h - upstream eXtension --------------*- C++ -*-===//
//
// This file is 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 TEMPORARY_TILEUSINGINTERFACE_X_H
#define TEMPORARY_TILEUSINGINTERFACE_X_H
#ifndef TILE_USING_INTERFACE_X_H
#define TILE_USING_INTERFACE_X_H

#include "mlir/Dialect/SCF/Transforms/TileUsingInterface.h"

Expand Down
6 changes: 3 additions & 3 deletions lib/gc/Transforms/TilingUtil.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//

#ifndef TEMPORARY_TILEUSINGINTERFACE_X_H
#define TEMPORARY_TILEUSINGINTERFACE_X_H
#ifndef TILING_UTIL_H
#define TILING_UTIL_H

#include "mlir/Dialect/Linalg/IR/Linalg.h"
#include "mlir/Dialect/Linalg/Transforms/Transforms.h"
Expand All @@ -16,7 +16,7 @@
namespace mlir {
namespace linalgX {

// An enahncement for the upstream pass to support tiling reduction for MKmk
// An enhancement for the upstream pass to support tiling reduction for MKmk
// like cases(with multiple reduction iterators).
FailureOr<linalg::ForallReductionTilingResult> tileReductionUsingForall(
RewriterBase &b, PartialReductionOpInterface op,
Expand Down