Skip to content
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

Jump to bottom

Improve #9399 using additions from #9408 #9427

Merged
merged 19 commits into from
Sep 25, 2022
Merged

Improve #9399 using additions from #9408 #9427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
aaa1faf
Use the externally used records marker.
mahge Sep 25, 2022
27d853c
Set marker to always be true for the OF.
mahge Sep 25, 2022
40d42e2
Use a map/dictionary instead of keeping separate lists.
mahge Sep 25, 2022
b013cbf
Add MetaModelica records to the map as well.
mahge Sep 25, 2022
3e0be2f
Debug help
mahge Sep 25, 2022
5c49ce6
Fix traversal order to avoid possible(?) infinite recursion.
mahge Sep 25, 2022
0a0dffc
Disable the old creation of record declarations.
mahge Sep 25, 2022
2fc57ee
Simplify processing of record declrations.
mahge Sep 25, 2022
488e939
Make sure we do not overwrite true values to false.
mahge Sep 25, 2022
3762296
Remove input lists from functions
mahge Sep 25, 2022
8eb7c59
Remove input and output lists from more functions.
mahge Sep 25, 2022
75ae70d
Remove input and output lists from elaborateRecordDeclarations.
mahge Sep 25, 2022
703ef91
Remove input and output lists from more functions.
mahge Sep 25, 2022
72e4c04
Convert recursive functions to loops.
mahge Sep 25, 2022
3f1c929
Rename some functions to be more descriptive.
mahge Sep 25, 2022
2c081a3
Change how records are collected from metarecordcalls
mahge Sep 25, 2022
237d047
Rename functions to be more descriptive.
mahge Sep 25, 2022
fc9cdbf
Convert recursive functions to loops.
mahge Sep 25, 2022
cffb199
Some minor cleanup and renaming.
mahge Sep 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/FrontEnd/DAE.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,7 @@ public uniontype Type "models the different front-end and back-end types"
ClassInf.State complexClassType "The type of a class";
list<Var> varLst "The variables of a complex type";
EqualityConstraint equalityConstraint;
Boolean needsExternalConversion "If the record is passed to an external function at any point, we need to generate conversion functions for it (for instance to convert 'modelica_integer' to 'int')";
Boolean usedExternally "If the record is passed to an external function at any point, we need to generate conversion functions for it (for instance to convert 'modelica_integer' to 'int')";
end T_COMPLEX;

record T_SUBTYPE_BASIC
Expand Down
4 changes: 2 additions & 2 deletions OMCompiler/Compiler/FrontEnd/Inst.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ algorithm
end for;
tvars := listReverse(tvars);

then DAE.T_COMPLEX(inType.complexClassType, tvars, inType.equalityConstraint, inType.needsExternalConversion);
then DAE.T_COMPLEX(inType.complexClassType, tvars, inType.equalityConstraint, inType.usedExternally);
end match;

end markDerivedRecordOutsideBindings;
Expand Down Expand Up @@ -1084,7 +1084,7 @@ algorithm
end for;
tvars := listReverse(tvars);

then DAE.T_COMPLEX(inType.complexClassType, tvars, inType.equalityConstraint, inType.needsExternalConversion);
then DAE.T_COMPLEX(inType.complexClassType, tvars, inType.equalityConstraint, inType.usedExternally);
end match;

end markTypesVarsOutsideBindings;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/FrontEnd/InstSection.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3108,7 +3108,7 @@ algorithm
equation
vars = List.sort(vars, connectorCompGt);
then
DAE.T_COMPLEX(ci_state, vars, ec, inType.needsExternalConversion);
DAE.T_COMPLEX(ci_state, vars, ec, inType.usedExternally);

else inType;

Expand Down
4 changes: 2 additions & 2 deletions OMCompiler/Compiler/FrontEnd/InstUtil.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5545,7 +5545,7 @@ algorithm
case (_,st,l,NONE(),equalityConstraint,_)
equation
failure(ClassInf.META_UNIONTYPE(_) = st);
then DAE.T_COMPLEX(st,l,equalityConstraint, false);
then DAE.T_COMPLEX(st,l,equalityConstraint, true);

// extending
case (_,st,l,SOME(bc),equalityConstraint,_)
Expand Down Expand Up @@ -5646,7 +5646,7 @@ algorithm

// not extending basic type!
case (_,st,l,NONE(),_)
then DAE.T_COMPLEX(st,l,NONE(), false); // adrpo: TODO! check equalityConstraint!
then DAE.T_COMPLEX(st,l,NONE(), true); // adrpo: TODO! check equalityConstraint!

case (_,st,l,SOME(bc),_)
then DAE.T_SUBTYPE_BASIC(st,l,bc,NONE());
Expand Down
6 changes: 3 additions & 3 deletions OMCompiler/Compiler/FrontEnd/Types.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ algorithm
equation
vars = List.map(vars, convertFromExpToTypesVar);
then
DAE.T_COMPLEX(CIS, vars, ec, inType.needsExternalConversion);
DAE.T_COMPLEX(CIS, vars, ec, inType.usedExternally);

case DAE.T_SUBTYPE_BASIC(CIS, vars, ty, ec)
equation
Expand Down Expand Up @@ -3871,7 +3871,7 @@ algorithm
true = Config.acceptMetaModelicaGrammar();
varLst = list(simplifyVar(v) for v in varLst);
then
DAE.T_COMPLEX(CIS, varLst, ec, inType.needsExternalConversion);
DAE.T_COMPLEX(CIS, varLst, ec, inType.usedExternally);

// do this for records too, otherwise:
// frame.R = Modelica.Mechanics.MultiBody.Frames.Orientation({const_matrix);
Expand All @@ -3880,7 +3880,7 @@ algorithm
equation
varLst = list(simplifyVar(v) for v in varLst);
then
DAE.T_COMPLEX(CIS, varLst, ec, inType.needsExternalConversion);
DAE.T_COMPLEX(CIS, varLst, ec, inType.usedExternally);

// otherwise just return the same!
case DAE.T_COMPLEX() then inType;
Expand Down
2 changes: 1 addition & 1 deletion OMCompiler/Compiler/SimCode/SimCodeFunction.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ uniontype RecordDeclaration
Option<String> aliasName "alias of struct (record) name ? encoded. Code generators can generate an aliasing typedef using this, and avoid problems when casting a record from one type to another (*(othertype*)(&var)), which only works if you have a lhs value.";
Absyn.Path defPath "definition path";
list<Variable> variables "only name and type";
Boolean needsExternalConversion "If the record is passed to an external function at any point, we need to generate conversion functions for it (for instance to convert 'modelica_integer' to 'int')";
Boolean usedExternally "If the record is passed to an external function at any point, we need to generate conversion functions for it (for instance to convert 'modelica_integer' to 'int')";
end RECORD_DECL_FULL;

record RECORD_DECL_ADD_CONSTRCTOR
Expand Down
424 changes: 169 additions & 255 deletions OMCompiler/Compiler/SimCode/SimCodeFunctionUtil.mo
View file
Open in desktop

Large diffs are not rendered by default.

35 changes: 24 additions & 11 deletions OMCompiler/Compiler/Template/CodegenCFunctions.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ template recordDeclaration(RecordDeclaration recDecl)
<%recordModelicaCallConstrctor(r.name, r.variables)%>

<%recordCopyDef(r.name, r.variables)%>
<%recordCopyExternalDefs(r.name, r.variables)%>
<%if r.usedExternally then recordCopyExternalDefs(r.name, r.variables)%>
>>
case r as RECORD_DECL_ADD_CONSTRCTOR(__) then
<<
Expand Down Expand Up @@ -498,7 +498,7 @@ end recordDeclarationExtraCtor;

template recordDeclarationFullHeader(RecordDeclaration recDecl)
"Generates structs for a record declaration. This will generate
a default record construtor function (no argumens) and a record copy function.
a default record constructor function (no arguments) and a record copy function.
These generated functions are fully recursive. That means records in records
will be handled properly.
It will also generate (#define) array versions of these functions."
Expand Down Expand Up @@ -536,28 +536,41 @@ template recordDeclarationFullHeader(RecordDeclaration recDecl)
case SOME(str) then
<<
typedef <%str%> <%rec_name%>;
typedef <%str%>_external <%rec_name%>_external;
<% if r.usedExternally then
<<
typedef <%str%>_external <%rec_name%>_external;
>>
%>
>>
else
<<
typedef struct {
<%r.variables |> var as VARIABLE(__) => '<%varType(var)%> _<%crefStr(var.name)%>;' ;separator="\n"%>
} <%rec_name%>;
typedef struct {
<%r.variables |> var as VARIABLE(__) => '<%extType(var.ty, true, false, false)%> _<%crefStr(var.name)%>;' ;separator="\n"%>
} <%rec_name%>_external;
>> %>
<% if r.usedExternally then
<<
typedef struct {
<%r.variables |> var as VARIABLE(__) => '<%extType(var.ty, true, false, false)%> _<%crefStr(var.name)%>;' ;separator="\n"%>
} <%rec_name%>_external;
>>
%>
>>
%>
extern struct record_description <%underscorePath(r.defPath)%>__desc;

void <%ctor_func_name%>(threadData_t *threadData, void* v_ths <%ctor_additional_inputs%>);
#define <%ctor_macro_name%>(td, ths <%ctor_macro_additional_inputs%>) <%ctor_func_name%>(td, &ths <%ctor_macro_additional_inputs%>)
void <%cpy_func_name%>(void* v_src, void* v_dst);
#define <%cpy_macro_name%>(src,dst) <%cpy_func_name%>(&src, &dst)
void <%cpy_to_external_func_name%>(void* v_src, void* v_dst);
#define <%cpy_to_external_macro_name%>(src,dst) <%cpy_to_external_func_name%>(&src, &dst)
void <%cpy_from_external_func_name%>(void* v_src, void* v_dst);
#define <%cpy_from_external_macro_name%>(src,dst) <%cpy_from_external_func_name%>(&src, &dst)

<%if r.usedExternally then
<<
void <%cpy_to_external_func_name%>(void* v_src, void* v_dst);
#define <%cpy_to_external_macro_name%>(src,dst) <%cpy_to_external_func_name%>(&src, &dst)
void <%cpy_from_external_func_name%>(void* v_src, void* v_dst);
#define <%cpy_from_external_macro_name%>(src,dst) <%cpy_from_external_func_name%>(&src, &dst)
>>
%>
// This function should eventually replace the default 'modelica' record constructor funcition
// that omc used to generate, i.e., replace functionBodyRecordConstructor template.
// <%rec_name%> <%modelica_ctor_name%>(threadData_t *threadData <%modelica_ctor_inputs%>);
Expand Down
1 change: 1 addition & 0 deletions OMCompiler/Compiler/Template/SimCodeTV.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,7 @@ package SimCodeFunction
Option<String> aliasName;
Absyn.Path defPath;
list<Variable> variables;
Boolean usedExternally;
end RECORD_DECL_FULL;
record RECORD_DECL_ADD_CONSTRCTOR
String ctor_name;
Expand Down