Skip to content

Commit 2303d3a

Browse files
lkorencxlauko
authored andcommitted
conv:hltollgeps: Improve codestyle and formatting.
1 parent cb0b0d1 commit 2303d3a

File tree

1 file changed

+32
-38
lines changed

1 file changed

+32
-38
lines changed

lib/vast/Conversion/FromHL/ToLLGEPs.cpp

+32-38
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
VAST_RELAX_WARNINGS
66
#include <mlir/Analysis/DataLayoutAnalysis.h>
77
#include <mlir/IR/PatternMatch.h>
8-
#include <mlir/Transforms/GreedyPatternRewriteDriver.h>
98
#include <mlir/Transforms/DialectConversion.h>
9+
#include <mlir/Transforms/GreedyPatternRewriteDriver.h>
1010
VAST_UNRELAX_WARNINGS
1111

1212
#include "PassesDetails.hpp"
@@ -15,67 +15,65 @@ VAST_UNRELAX_WARNINGS
1515
#include "vast/Dialect/HighLevel/HighLevelUtils.hpp"
1616
#include "vast/Dialect/LowLevel/LowLevelOps.hpp"
1717

18-
#include "vast/Util/Symbols.hpp"
1918
#include "vast/Util/DialectConversion.hpp"
19+
#include "vast/Util/Symbols.hpp"
2020

21-
namespace vast
22-
{
23-
namespace
24-
{
21+
namespace vast {
22+
namespace {
2523
struct record_member_op : mlir::OpConversionPattern< hl::RecordMemberOp >
2624
{
2725
using op_t = hl::RecordMemberOp;
2826
using base = mlir::OpConversionPattern< op_t >;
2927
using base::base;
3028

3129
logical_result matchAndRewrite(
32-
op_t op, typename op_t::Adaptor ops,
33-
conversion_rewriter &rewriter
30+
op_t op, typename op_t::Adaptor ops, conversion_rewriter &rewriter
3431
) const override {
3532
auto parent_type = ops.getRecord().getType();
3633

3734
auto mod = op->getParentOfType< vast_module >();
38-
if (!mod)
35+
if (!mod) {
3936
return mlir::failure();
37+
}
4038

4139
auto def = hl::definition_of(parent_type, mod);
42-
if (auto struct_decl = mlir::dyn_cast_or_null< hl::StructDeclOp >(*def))
40+
if (auto struct_decl = mlir::dyn_cast_or_null< hl::StructDeclOp >(*def)) {
4341
return lower(op, ops, rewriter, struct_decl);
44-
if (auto union_decl = mlir::dyn_cast_or_null< hl::UnionDeclOp >(*def))
42+
}
43+
if (auto union_decl = mlir::dyn_cast_or_null< hl::UnionDeclOp >(*def)) {
4544
return lower(op, ops, rewriter, union_decl);
45+
}
4646

4747
return mlir::failure();
4848
}
4949

5050
logical_result lower(
51-
op_t op, typename op_t::Adaptor ops,
52-
conversion_rewriter &rewriter, hl::StructDeclOp struct_decl) const
53-
{
51+
op_t op, typename op_t::Adaptor ops, conversion_rewriter &rewriter,
52+
hl::StructDeclOp struct_decl
53+
) const {
5454
auto idx = hl::field_idx(op.getName(), struct_decl);
55-
if (!idx)
55+
if (!idx) {
5656
return mlir::failure();
57+
}
5758

5859
return replace(op, ops, rewriter, *idx);
5960
}
6061

6162
logical_result lower(
62-
op_t op, typename op_t::Adaptor ops,
63-
conversion_rewriter &rewriter, hl::UnionDeclOp union_decl
63+
op_t op, typename op_t::Adaptor ops, conversion_rewriter &rewriter,
64+
hl::UnionDeclOp union_decl
6465
) const {
6566
// After lowered, union will only have one member.
6667
return replace(op, ops, rewriter, 0);
6768
}
6869

6970
logical_result replace(
70-
op_t op, typename op_t::Adaptor ops,
71-
conversion_rewriter &rewriter, auto idx
71+
op_t op, typename op_t::Adaptor ops, conversion_rewriter &rewriter, auto idx
7272
) const {
7373
auto gep = rewriter.create< ll::StructGEPOp >(
74-
op.getLoc(),
75-
op.getType(),
76-
ops.getRecord(),
77-
rewriter.getI32IntegerAttr(idx),
78-
op.getNameAttr());
74+
op.getLoc(), op.getType(), ops.getRecord(), rewriter.getI32IntegerAttr(idx),
75+
op.getNameAttr()
76+
);
7977
rewriter.replaceOp(op, gep);
8078
return mlir::success();
8179
}
@@ -85,29 +83,25 @@ namespace vast
8583

8684
struct HLToLLGEPsPass : HLToLLGEPsBase< HLToLLGEPsPass >
8785
{
88-
void runOnOperation() override
89-
{
90-
auto op = this->getOperation();
86+
void runOnOperation() override {
87+
auto op = this->getOperation();
9188
auto &mctx = this->getContext();
9289

93-
{
94-
mlir::ConversionTarget trg(mctx);
95-
trg.markUnknownOpDynamicallyLegal( [](auto) { return true; } );
96-
trg.addIllegalOp< hl::RecordMemberOp >();
90+
mlir::ConversionTarget trg(mctx);
91+
trg.markUnknownOpDynamicallyLegal([](auto) { return true; });
92+
trg.addIllegalOp< hl::RecordMemberOp >();
9793

98-
mlir::RewritePatternSet patterns(&mctx);
94+
mlir::RewritePatternSet patterns(&mctx);
9995

100-
patterns.add< record_member_op >(&mctx);
96+
patterns.add< record_member_op >(&mctx);
10197

102-
if (mlir::failed(mlir::applyPartialConversion(op, trg, std::move(patterns))))
103-
return signalPassFailure();
98+
if (mlir::failed(mlir::applyPartialConversion(op, trg, std::move(patterns)))) {
99+
return signalPassFailure();
104100
}
105101
}
106102
};
107103
} // namespace vast
108104

109-
110-
std::unique_ptr< mlir::Pass > vast::createHLToLLGEPsPass()
111-
{
105+
std::unique_ptr< mlir::Pass > vast::createHLToLLGEPsPass() {
112106
return std::make_unique< vast::HLToLLGEPsPass >();
113107
}

0 commit comments

Comments
 (0)