Skip to content

Commit 9d0b312

Browse files
mscuttarimscuttari
committed
Remove matching information from IDA and KINSOL
1 parent 407ecd0 commit 9d0b312

File tree

7 files changed

+16
-47
lines changed

7 files changed

+16
-47
lines changed

‎.jenkins/version_marco_runtime.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
809a07b93d378bbcedd99937789a73b833689ead
1+
ca68297be7d409fa47aca740b55b33f9cac53965

‎include/public/marco/Dialect/IDA/IR/IDAOps.td‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,28 +225,26 @@ def IDA_AddEquationOp
225225

226226
```mlir
227227
%0 = ... : !ida.variable
228-
ida.add_equation @instance, %0 { equationRanges : #modeling<multidim_range [4,7][9,13][1,3]>, writeAccess : affine_map<(d0, d1, d2)[s0] -> (d1, d0 + s0, d2)> } : !ida.variable -> !ida.equation
228+
ida.add_equation @instance { equationRanges : #modeling<multidim_range [4,7][9,13][1,3]> } : !ida.equation
229229
```
230230
}];
231231

232232
let arguments = (ins
233233
SymbolNameAttr:$instance,
234234
MultidimensionalRangeAttr:$equationRanges,
235-
IDAVariable:$writtenVariable,
236-
SymbolNameAttr:$writeAccessFunction,
237235
OptionalAttr<StrAttr>:$stringRepresentation);
238236

239237
let results = (outs IDAEquation:$equation);
240238

241239
let builders = [
242-
OpBuilder<(ins "llvm::StringRef":$idaInstance, "MultidimensionalRangeAttr":$equationRanges, "Value":$writtenVariable, "llvm::StringRef":$writeAccessFunction), [{
240+
OpBuilder<(ins "llvm::StringRef":$idaInstance, "MultidimensionalRangeAttr":$equationRanges), [{
243241
auto resultType = ida::EquationType::get($_builder.getContext());
244-
build($_builder, $_state, resultType, idaInstance, equationRanges, writtenVariable, writeAccessFunction, nullptr);
242+
build($_builder, $_state, resultType, idaInstance, equationRanges, nullptr);
245243
}]>
246244
];
247245

248246
let assemblyFormat = [{
249-
$instance `,` $writtenVariable attr-dict `:` type($writtenVariable) `->` type($equation)
247+
$instance attr-dict `:` type($equation)
250248
}];
251249
}
252250

‎include/public/marco/Dialect/KINSOL/IR/KINSOLOps.td‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,28 +104,26 @@ def KINSOL_AddEquationOp
104104

105105
```mlir
106106
%0 = ... : !kinsol.variable
107-
kinsol.add_equation @instance, %0 { equationRanges : #modeling<multidim_range [4,7][9,13][1,3]>, writeAccess : affine_map<(d0, d1, d2)[s0] -> (d1, d0 + s0, d2)> } : !kinsol.variable -> !kinsol.equation
107+
kinsol.add_equation @instance { equationRanges : #modeling<multidim_range [4,7][9,13][1,3]> } : !kinsol.equation
108108
```
109109
}];
110110

111111
let arguments = (ins
112112
SymbolNameAttr:$instance,
113113
MultidimensionalRangeAttr:$equationRanges,
114-
KINSOLVariable:$writtenVariable,
115-
SymbolNameAttr:$writeAccessFunction,
116114
OptionalAttr<StrAttr>:$stringRepresentation);
117115

118116
let results = (outs KINSOLEquation:$equation);
119117

120118
let builders = [
121-
OpBuilder<(ins "llvm::StringRef":$kinsolInstance, "MultidimensionalRangeAttr":$equationRanges, "Value":$writtenVariable, "llvm::StringRef":$writeAccessFunction), [{
119+
OpBuilder<(ins "llvm::StringRef":$kinsolInstance, "MultidimensionalRangeAttr":$equationRanges), [{
122120
auto resultType = kinsol::EquationType::get($_builder.getContext());
123-
build($_builder, $_state, resultType, kinsolInstance, equationRanges, writtenVariable, writeAccessFunction, nullptr);
121+
build($_builder, $_state, resultType, kinsolInstance, equationRanges, nullptr);
124122
}]>
125123
];
126124

127125
let assemblyFormat = [{
128-
$instance `,` $writtenVariable attr-dict `:` type($writtenVariable) `->` type($equation)
126+
$instance attr-dict `:` type($equation)
129127
}];
130128
}
131129

‎lib/Codegen/Conversion/IDAToLLVM/IDAToLLVM.cpp‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -490,8 +490,8 @@ struct AddEquationOpLowering : public IDAOpConversion<AddEquationOp> {
490490

491491
RuntimeFunctionsMangling mangling;
492492

493-
llvm::SmallVector<mlir::Value, 6> args;
494-
llvm::SmallVector<std::string, 6> mangledArgsTypes;
493+
llvm::SmallVector<mlir::Value, 4> args;
494+
llvm::SmallVector<std::string, 4> mangledArgsTypes;
495495

496496
// IDA instance.
497497
args.push_back(getInstance(rewriter, loc, adaptor.getInstance()));
@@ -517,18 +517,6 @@ struct AddEquationOpLowering : public IDAOpConversion<AddEquationOp> {
517517
mangledArgsTypes.push_back(
518518
mangling.getIntegerType(rank.getType().getIntOrFloatBitWidth()));
519519

520-
// Written variable.
521-
args.push_back(adaptor.getWrittenVariable());
522-
523-
mangledArgsTypes.push_back(mangling.getIntegerType(
524-
adaptor.getWrittenVariable().getType().getIntOrFloatBitWidth()));
525-
526-
// Write access function.
527-
args.push_back(
528-
getAccessFunctionAddress(rewriter, loc, op.getWriteAccessFunction()));
529-
530-
mangledArgsTypes.push_back(mangling.getVoidPointerType());
531-
532520
// String representation.
533521
mangledArgsTypes.push_back(mangling.getVoidPointerType());
534522

‎lib/Codegen/Conversion/KINSOLToLLVM/KINSOLToLLVM.cpp‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ struct AddEquationOpLowering : public KINSOLOpConversion<AddEquationOp> {
366366

367367
RuntimeFunctionsMangling mangling;
368368

369-
llvm::SmallVector<mlir::Value, 6> args;
370-
llvm::SmallVector<std::string, 6> mangledArgsTypes;
369+
llvm::SmallVector<mlir::Value, 4> args;
370+
llvm::SmallVector<std::string, 4> mangledArgsTypes;
371371

372372
// KINSOL instance.
373373
args.push_back(getInstance(rewriter, loc, adaptor.getInstance()));
@@ -393,18 +393,6 @@ struct AddEquationOpLowering : public KINSOLOpConversion<AddEquationOp> {
393393
mangledArgsTypes.push_back(
394394
mangling.getIntegerType(rank.getType().getIntOrFloatBitWidth()));
395395

396-
// Written variable.
397-
args.push_back(adaptor.getWrittenVariable());
398-
399-
mangledArgsTypes.push_back(mangling.getIntegerType(
400-
adaptor.getWrittenVariable().getType().getIntOrFloatBitWidth()));
401-
402-
// Write access function.
403-
args.push_back(
404-
getAccessFunctionAddress(rewriter, loc, op.getWriteAccessFunction()));
405-
406-
mangledArgsTypes.push_back(mangling.getVoidPointerType());
407-
408396
// String representation.
409397
mangledArgsTypes.push_back(mangling.getVoidPointerType());
410398

‎lib/Dialect/BaseModelica/Transforms/IDA.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,8 +821,7 @@ mlir::LogicalResult IDAInstance::addEquationsToIDA(
821821
auto idaEquation = rewriter.create<mlir::ida::AddEquationOp>(
822822
equationOp.getLoc(), identifier,
823823
mlir::ida::MultidimensionalRangeAttr::get(rewriter.getContext(),
824-
range),
825-
variablesMapping[writtenVar], accessFunctionOp.getSymName());
824+
range));
826825

827826
if (debugInformation) {
828827
std::string stringRepresentation;

‎lib/Dialect/BaseModelica/Transforms/SCCSolvingWithKINSOL.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -630,8 +630,7 @@ mlir::LogicalResult KINSOLInstance::addEquationsToKINSOL(
630630
auto kinsolEquation = rewriter.create<mlir::kinsol::AddEquationOp>(
631631
equationOp.getLoc(), identifier,
632632
mlir::kinsol::MultidimensionalRangeAttr::get(rewriter.getContext(),
633-
range),
634-
variablesMapping[writtenVar], accessFunctionOp.getSymName());
633+
range));
635634

636635
if (debugInformation) {
637636
std::string stringRepresentation;
@@ -731,8 +730,7 @@ mlir::LogicalResult KINSOLInstance::addEquationsToKINSOL(
731730
auto kinsolEquation = rewriter.create<mlir::kinsol::AddEquationOp>(
732731
variableOp.getLoc(), identifier,
733732
mlir::kinsol::MultidimensionalRangeAttr::get(rewriter.getContext(),
734-
range),
735-
variablesMapping[variableOp], accessFunctionOp.getSymName());
733+
range));
736734

737735
if (debugInformation) {
738736
kinsolEquation.setStringRepresentationAttr(

0 commit comments

Comments
 (0)