Skip to content

Соловьев Алексей. Лабораторная работа 4. MLIR. Вариант 2 #149

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

Open
wants to merge 11 commits into
base: course-spring-2025
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 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
16 changes: 16 additions & 0 deletions mlir/compiler-course/solovev_a/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
set(Title "Lab_4_mlir")
set(Student "Solovev_a")
set(Group "FIIT1")
set(TARGET_NAME "${Title}_${Student}_${Group}_MLIR")

file(GLOB_RECURSE SOURCES *.cpp *.h *.hpp)

add_llvm_pass_plugin(${TARGET_NAME}
${SOURCES}
DEPENDS
intrinsics_gen
MLIRBuiltinLocationAttributesIncGen
BUILDTREE_ONLY
)

set(MLIR_TEST_DEPENDS ${TARGET_NAME} ${MLIR_TEST_DEPENDS} PARENT_SCOPE)
61 changes: 61 additions & 0 deletions mlir/compiler-course/solovev_a/SCFLoop.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#include "mlir/Dialect/SCF/IR/SCF.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/Operation.h"
#include "mlir/IR/PatternMatch.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Tools/Plugins/PassPlugin.h"
#include "llvm/Support/raw_ostream.h"

using namespace mlir;

namespace {
class ScfForLoopsPass
: public PassWrapper<ScfForLoopsPass, OperationPass<ModuleOp>> {
public:
StringRef getArgument() const final {
return "Lab_4_mlir_Solovev_a_FIIT1_MLIR";
}
StringRef getDescription() const final {
return "Annotate scf.for loops with trip_count attribute if known";
}
void runOnOperation() override {
ModuleOp moduleOp = getOperation();
moduleOp.walk([&](scf::ForOp forOp) {
auto lowerBound =
forOp.getLowerBound().getDefiningOp<arith::ConstantIndexOp>();
auto upperBound =
forOp.getUpperBound().getDefiningOp<arith::ConstantIndexOp>();
auto step = forOp.getStep().getDefiningOp<arith::ConstantIndexOp>();
if (lowerBound && upperBound && step) {
int64_t lb = lowerBound.value();
int64_t ub = upperBound.value();
int64_t st = step.value();
if (st == 0)
return;
int64_t tripCount = 0;
if ((st > 0 && lb < ub) || (st < 0 && lb > ub)) {
tripCount = (std::abs(ub - lb) + std::abs(st) - 1) / std::abs(st);
forOp->setAttr(
"trip_count",
IntegerAttr::get(IndexType::get(forOp.getContext()), tripCount));
}
}
});
}
};
} // namespace

MLIR_DECLARE_EXPLICIT_TYPE_ID(ScfForLoopsPass)
MLIR_DEFINE_EXPLICIT_TYPE_ID(ScfForLoopsPass)

mlir::PassPluginLibraryInfo getFunctionCallCounterPassPluginInfo() {
return {MLIR_PLUGIN_API_VERSION, "ScfForLoopsPass", "1.0",
[]() { mlir::PassRegistration<ScfForLoopsPass>(); }};
}

extern "C" LLVM_ATTRIBUTE_WEAK mlir::PassPluginLibraryInfo
mlirGetPassPluginInfo() {
return getFunctionCallCounterPassPluginInfo();
}
142 changes: 142 additions & 0 deletions mlir/test/compiler-course/solovev_a_test/test.mlir
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
// RUN: mlir-opt -load-pass-plugin=%mlir_lib_dir/Lab_4_mlir_Solovev_a_FIIT1_MLIR%shlibext \
// RUN: --pass-pipeline="builtin.module(Lab_4_mlir_Solovev_a_FIIT1_MLIR)" %s | FileCheck %s

module {
// Test 1. Simple loop with static trip count
// CHECK-LABEL: func.func @test_simple_for
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %c10 = arith.constant 10 : index
// CHECK-NEXT: %c1 = arith.constant 1 : index
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %c10 = arith.constant 10 : index
// CHECK-NEXT: %c1 = arith.constant 1 : index
// CHECK-DAG: %c0 = arith.constant 0 : index
// CHECK-DAG: %c10 = arith.constant 10 : index
// CHECK-DAG: %c1 = arith.constant 1 : index

Also in other tests

// CHECK-NEXT: scf.for %{{.*}} = %c0 to %c10 step %c1 {
// CHECK-NEXT: %{{.*}} = arith.muli %{{.*}}, %c1 : index
// CHECK-NEXT: %{{.*}} = arith.addi %{{.*}}, %c0 : index
// CHECK-NEXT: } {trip_count = 10 : index}
// CHECK-NEXT: return
func.func @test_simple_for() {
%c0 = arith.constant 0 : index
%c10 = arith.constant 10 : index
%c1 = arith.constant 1 : index

scf.for %i = %c0 to %c10 step %c1 {
%mul = arith.muli %i, %c1 : index
%add = arith.addi %mul, %c0 : index
}

return
}

// Test 2. Nested loops with static trip counts
// CHECK-LABEL: func.func @test_nested_loops
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %c4 = arith.constant 4 : index
// CHECK-NEXT: %c2 = arith.constant 2 : index
// CHECK-NEXT: scf.for %{{.*}} = %c0 to %c4 step %c2 {
// CHECK-NEXT: scf.for %{{.*}} = %c0 to %c4 step %c2 {
// CHECK-NEXT: } {trip_count = 2 : index}
// CHECK-NEXT: } {trip_count = 2 : index}
// CHECK-NEXT: return
func.func @test_nested_loops() {
%c0 = arith.constant 0 : index
%c4 = arith.constant 4 : index
%c2 = arith.constant 2 : index

scf.for %i = %c0 to %c4 step %c2 {
scf.for %j = %c0 to %c4 step %c2 {
}
}

return
}

// Test 3. Loop with dynamic trip count (no attribute expected)
// CHECK-LABEL: func.func @test_dynamic_loop
// CHECK-NEXT: scf.for %{{.*}} = %{{.*}} to %{{.*}} step %{{.*}} {
// CHECK-NEXT: %{{.*}} = arith.muli %{{.*}}, %{{.*}} : index
// CHECK-NEXT: }{{$}}
// CHECK-NEXT: return
func.func @test_dynamic_loop(%from: index, %to: index, %step: index) {
scf.for %i = %from to %to step %step {
%v = arith.muli %i, %step : index
}

return
}

// Test 4. Loop with non-zero lower bound
// CHECK-LABEL: func.func @test_nonzero_lower_bound
// CHECK-NEXT: %c5 = arith.constant 5 : index
// CHECK-NEXT: %c15 = arith.constant 15 : index
// CHECK-NEXT: %c2 = arith.constant 2 : index
// CHECK-NEXT: scf.for %{{.*}} = %c5 to %c15 step %c2 {
// CHECK-NEXT: } {trip_count = 5 : index}
// CHECK-NEXT: return
func.func @test_nonzero_lower_bound() {
%c5 = arith.constant 5 : index
%c15 = arith.constant 15 : index
%c2 = arith.constant 2 : index

scf.for %i = %c5 to %c15 step %c2 {
}

return
}

// Test 5. Loop inside conditional block
// CHECK-LABEL: func.func @test_loop_in_if
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %c3 = arith.constant 3 : index
// CHECK-NEXT: %c1 = arith.constant 1 : index
// CHECK-NEXT: scf.if %{{.*}} {
// CHECK-NEXT: scf.for %{{.*}} = %c0 to %c3 step %c1 {
// CHECK-NEXT: } {trip_count = 3 : index}
// CHECK-NEXT: }
// CHECK-NEXT: return
func.func @test_loop_in_if(%cond: i1) {
%c0 = arith.constant 0 : index
%c3 = arith.constant 3 : index
%c1 = arith.constant 1 : index

scf.if %cond {
scf.for %i = %c0 to %c3 step %c1 {
}
}

return
}

// Test 6. Descending loop
// CHECK-LABEL: func.func @test_descending_loop
// CHECK-NEXT: %c10 = arith.constant 10 : index
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %[[NEG3:.*]] = arith.constant -3 : index
// CHECK-NEXT: scf.for %{{.*}} = %c10 to %c0 step %[[NEG3]] {
// CHECK-NEXT: } {trip_count = 4 : index}
// CHECK-NEXT: return
func.func @test_descending_loop() {
%c10 = arith.constant 10 : index
%c0 = arith.constant 0 : index
%c-3 = arith.constant -3 : index
scf.for %arg0 = %c10 to %c0 step %c-3 {
}

return
}

// Test 7. Negative step with invalid range (should not set trip_count)
// CHECK-LABEL: func.func @test_negative_step_wrong_range
// CHECK-NEXT: %c0 = arith.constant 0 : index
// CHECK-NEXT: %c3 = arith.constant 3 : index
// CHECK-NEXT: %[[NEG2:.*]] = arith.constant -2 : index
// CHECK-NEXT: scf.for %{{.*}} = %c0 to %c3 step %[[NEG2]] {
// CHECK-NEXT: }
Copy link

Choose a reason for hiding this comment

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

Actually, if the pass suddenly prints trip_count, this check won't detect that. Because it doesn't check that there is no more text in current line after closing brace.

Copy link
Author

Choose a reason for hiding this comment

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

Added CHECK-NOT for trip_count validation

// CHECK-NEXT: return
func.func @test_negative_step_wrong_range() {
%c0 = arith.constant 0 : index
%c3 = arith.constant 3 : index
%c_neg2 = arith.constant -2 : index
scf.for %i = %c0 to %c3 step %c_neg2 {
}

return
}
}
Loading