Skip to content

Add loop annotation attribute interface #7

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add loop annotation attribute interface #7

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
3 changes: 2 additions & 1 deletion mlir/include/mlir/Dialect/LLVMIR/LLVMAttrDefs.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#ifndef LLVMIR_ATTRDEFS
#define LLVMIR_ATTRDEFS

include "mlir/Interfaces/LoopAnnotationAttrInterface.td"
include "mlir/Dialect/LLVMIR/LLVMDialect.td"
include "mlir/Dialect/LLVMIR/LLVMInterfaces.td"
include "mlir/IR/AttrTypeBase.td"
Expand Down Expand Up @@ -204,7 +205,7 @@ def LoopUnswitchAttr : LLVM_Attr<"LoopUnswitch", "loop_unswitch"> {
let assemblyFormat = "`<` struct(params) `>`";
}

def LoopAnnotationAttr : LLVM_Attr<"LoopAnnotation", "loop_annotation"> {
def LoopAnnotationAttr : LLVM_Attr<"LoopAnnotation", "loop_annotation", [LoopAnnotationAttrInterface]> {
let description = [{
This attributes encapsulates "loop metadata". It is meant to decorate
branches that are "latches" (loop backedges) and maps to the `!llvm.loop`
Expand Down
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/LLVMIR/LLVMAttrs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#include "mlir/IR/OpImplementation.h"
#include "mlir/Interfaces/LoopAnnotationAttrInterface.h"
#include <optional>

#include "mlir/Dialect/LLVMIR/LLVMOpsEnums.h.inc"
Expand Down
6 changes: 6 additions & 0 deletions mlir/include/mlir/Interfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ mlir_tablegen(MemorySlotTypeInterfaces.cpp.inc -gen-type-interface-defs)
add_public_tablegen_target(MLIRMemorySlotInterfacesIncGen)
add_dependencies(mlir-generic-headers MLIRMemorySlotInterfacesIncGen)

set(LLVM_TARGET_DEFINITIONS LoopAnnotationAttrInterface.td)
mlir_tablegen(LoopAnnotationAttrInterface.h.inc -gen-attr-interface-decls)
mlir_tablegen(LoopAnnotationAttrInterface.cpp.inc -gen-attr-interface-defs)
add_public_tablegen_target(MLIRLoopAnnotationAttrInterfaceIncGen)
add_dependencies(mlir-generic-headers MLIRLoopAnnotationAttrInterfaceIncGen)

set(LLVM_TARGET_DEFINITIONS DataLayoutInterfaces.td)
mlir_tablegen(DataLayoutAttrInterface.h.inc -gen-attr-interface-decls)
mlir_tablegen(DataLayoutAttrInterface.cpp.inc -gen-attr-interface-defs)
Expand Down
15 changes: 15 additions & 0 deletions mlir/include/mlir/Interfaces/LoopAnnotationAttrInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//===- LoopAnnotationAttrInterface.h ----------------------------*- C++ -*-===//
//
// Part of the LLVM Project, 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 MLIR_INTERFACES_LOOPANNOTATIONINTERFACE_H
#define MLIR_INTERFACES_LOOPANNOTATIONINTERFACE_H

#include "mlir/IR/Attributes.h"
#include "mlir/Interfaces/LoopAnnotationAttrInterface.h.inc"

#endif // MLIR_INTERFACES_LOOPANNOTATIONINTERFACE_H
28 changes: 28 additions & 0 deletions mlir/include/mlir/Interfaces/LoopAnnotationAttrInterface.td
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//===- LoopAnnotationAttrInterface.td ----------------------*- tablegen -*-===//
//
// Part of the LLVM Project, 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
//
//===----------------------------------------------------------------------===//
//
// Defines the interface for attributes on loop-like operations.
//
//===----------------------------------------------------------------------===//

#ifndef MLIR_INTERFACES_LOOPANNOTATIONATTRINTERFACE
#define MLIR_INTERFACES_LOOPANNOTATIONATTRINTERFACE

include "mlir/IR/OpBase.td"

def LoopAnnotationAttrInterface : AttrInterface<"LoopAnnotationAttrInterface"> {
let description = [{
Metadata that should live on loop-like operations.
}];
let cppNamespace = "::mlir";

let methods = [
];
}

#endif // MLIR_INTERFACES_LOOPANNOTATIONATTRINTERFACE
1 change: 1 addition & 0 deletions mlir/include/mlir/Interfaces/LoopLikeInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define MLIR_INTERFACES_LOOPLIKEINTERFACE_H_

#include "mlir/IR/OpDefinition.h"
#include "mlir/Interfaces/LoopAnnotationAttrInterface.h"

namespace mlir {
class RewriterBase;
Expand Down
17 changes: 17 additions & 0 deletions mlir/include/mlir/Interfaces/LoopLikeInterface.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define MLIR_INTERFACES_LOOPLIKEINTERFACE

include "mlir/IR/OpBase.td"
include "mlir/Interfaces/LoopAnnotationAttrInterface.td"

//===----------------------------------------------------------------------===//
// Interfaces
Expand Down Expand Up @@ -232,6 +233,22 @@ def LoopLikeOpInterface : OpInterface<"LoopLikeOpInterface"> {
/*defaultImplementation=*/[{
return ::mlir::failure();
}]
>,
InterfaceMethod<[{
Returns the loop annotation attributes.
}],
/*retTy=*/"::mlir::SmallVector<::mlir::NamedAttribute>",
/*methodName=*/"getLoopAnnotationAttributes",
/*args=*/(ins),
/*methodBody=*/"",
/*defaultImplementation=*/[{
SmallVector<NamedAttribute> loopAnnotationAttrs;
llvm::copy_if($_op->getAttrs(), std::back_inserter(loopAnnotationAttrs),
[](auto attr) -> bool {
return mlir::isa<mlir::LoopAnnotationAttrInterface>(attr.getValue());
});
return loopAnnotationAttrs;
}]
>
];

Expand Down
1 change: 0 additions & 1 deletion mlir/lib/Conversion/SCFToControlFlow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ add_mlir_conversion_library(MLIRSCFToControlFlow
LINK_LIBS PUBLIC
MLIRArithDialect
MLIRControlFlowDialect
MLIRLLVMDialect
MLIRSCFDialect
MLIRSCFTransforms
MLIRTransforms
Expand Down
9 changes: 2 additions & 7 deletions mlir/lib/Conversion/SCFToControlFlow/SCFToControlFlow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/Dialect/ControlFlow/IR/ControlFlowOps.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
Copy link
Owner Author

Choose a reason for hiding this comment

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

this conversion pass no longer needs to depend on llvm dialect, and other conversion dialects where this info is currently being lost can now propagate these attributes without depending on it either

#include "mlir/Dialect/SCF/IR/SCF.h"
#include "mlir/Dialect/SCF/Transforms/Transforms.h"
#include "mlir/IR/Builders.h"
Expand Down Expand Up @@ -377,12 +376,8 @@ LogicalResult ForLowering::matchAndRewrite(ForOp forOp,

// Let the CondBranchOp carry the LLVM attributes from the ForOp, such as the
// llvm.loop_annotation attribute.
SmallVector<NamedAttribute> llvmAttrs;
llvm::copy_if(forOp->getAttrs(), std::back_inserter(llvmAttrs),
[](auto attr) {
return isa<LLVM::LLVMDialect>(attr.getValue().getDialect());
});
condBranchOp->setDiscardableAttrs(llvmAttrs);
condBranchOp->setDiscardableAttrs(forOp.getLoopAnnotationAttributes());

// The result of the loop operation is the values of the condition block
// arguments except the induction variable on the last iteration.
rewriter.replaceOp(forOp, conditionBlock->getArguments().drop_front());
Expand Down
14 changes: 14 additions & 0 deletions mlir/lib/Interfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ set(LLVM_OPTIONAL_SOURCES
FunctionInterfaces.cpp
InferIntRangeInterface.cpp
InferTypeOpInterface.cpp
LoopAnnotationAttrInterface.cpp
LoopLikeInterface.cpp
MemorySlotInterfaces.cpp
ParallelCombiningOpInterface.cpp
Expand Down Expand Up @@ -65,6 +66,19 @@ add_mlir_library(MLIRFunctionInterfaces
add_mlir_interface_library(InferIntRangeInterface)
add_mlir_interface_library(InferTypeOpInterface)

add_mlir_library(MLIRLoopAnnotationAttrInterface
LoopAnnotationAttrInterface.cpp

ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Interfaces

DEPENDS
MLIRLoopAnnotationAttrInterfaceIncGen

LINK_LIBS PUBLIC
MLIRIR
)

add_mlir_library(MLIRLoopLikeInterface
LoopLikeInterface.cpp

Expand Down
3 changes: 3 additions & 0 deletions mlir/lib/Interfaces/LoopAnnotationAttrInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include "mlir/Interfaces/LoopAnnotationAttrInterface.h"
using namespace mlir;
#include "mlir/Interfaces/LoopAnnotationAttrInterface.cpp.inc"