[NF,BE] Avoid expansion of vectorized bindings if not scalarizing (#12951)

- NF: use each for vectorized attributes
- BE: remove fill from vectorized variable and parameter bindings

Author: rfranke

OMCompiler/Compiler/BackEnd/BackendDAECreate.mo

@@ -1164,6 +1164,13 @@ algorithm
       algorithm
         // Add the binding as an equation and remove the binding from the variable.
         outVars := lowerDynamicVar(inElement, inFunctions) :: outVars;
+        // remove fill from binding exp to avoid expansion if not scalarizing, treating like each
+        e2 := match(Flags.isSet(Flags.NF_SCALARIZE), e2)
+          case (false, DAE.CALL(path = Absyn.IDENT("fill"), expLst = {e1, _})) then
+            e1;
+          else
+            e2;
+        end match;
         e1 := Expression.crefExp(cr);
         attr := BackendDAE.EQ_ATTR_DEFAULT_BINDING;
         (tp, dims) := ComponentReference.crefTypeFull2(cr);
@@ -1293,7 +1300,8 @@ algorithm
       list<DAE.Dimension> dims;
       DAE.ComponentRef name;
       BackendDAE.VarKind kind_1;
-      Option<DAE.Exp> bind, bind1;
+      Option<DAE.Exp> bind;
+      DAE.Exp e1;
       DAE.VarKind kind;
       DAE.VarDirection dir;
       DAE.VarParallelism prl;
@@ -1331,6 +1339,13 @@ algorithm
       equation
         kind_1 = lowerKnownVarkind(kind, name, dir, ct, protection);
         // bind = fixParameterStartBinding(bind, t, dae_var_attr, kind_1);
+        // remove fill from binding exp to avoid expansion if not scalarizing, treating like each
+        bind = match(Flags.isSet(Flags.NF_SCALARIZE), bind)
+          case (false, SOME(DAE.CALL(path = Absyn.IDENT("fill"), expLst = {e1, _}))) then
+            SOME(e1);
+          else
+            bind;
+        end match;
         tp = lowerType(t);
         b = DAEUtil.boolVarVisibility(protection);
         dae_var_attr = DAEUtil.setProtectedAttr(dae_var_attr, b);

OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo

@@ -436,12 +436,12 @@ protected
   String attr_name;
   Binding attr_binding;
 algorithm
-  var.binding := fillVectorizedBinding(var.binding, var.ty);
+  var.binding := fillVectorizedBinding(var.binding, var.ty, false);
 
   for ty_attr in var.typeAttributes loop
     (attr_name, attr_binding) := ty_attr;
     attr_binding := fillVectorizedBinding(attr_binding,
-      Type.copyDims(var.ty, Binding.getType(attr_binding)));
+      Type.copyDims(var.ty, Binding.getType(attr_binding)), true);
     ty_attrs := (attr_name, attr_binding) :: ty_attrs;
   end for;
 
@@ -1238,6 +1238,7 @@ end vectorizeBinding;
 function fillVectorizedBinding
   input output Binding binding;
   input Type varType;
+  input Boolean isAttribute;
 protected
   Expression bind_exp;
   Type bind_ty;
@@ -1258,10 +1259,14 @@ algorithm
         dim_diff := Type.dimensionDiff(varType, bind_ty);
 
         if dim_diff > 0 then
-          dim_expl := list(Dimension.sizeExp(d) for d in List.firstN(Type.arrayDims(varType), dim_diff));
-          binding.bindingExp := Expression.CALL(Call.makeTypedCall(NFBuiltinFuncs.FILL_FUNC,
-            binding.bindingExp :: dim_expl, binding.variability, Purity.PURE, varType));
-          binding.bindingType := Expression.typeOf(binding.bindingExp);
+          if isAttribute then
+            binding.eachType := NFBinding.EachType.EACH;
+          else
+            dim_expl := list(Dimension.sizeExp(d) for d in List.firstN(Type.arrayDims(varType), dim_diff));
+            binding.bindingExp := Expression.CALL(Call.makeTypedCall(NFBuiltinFuncs.FILL_FUNC,
+              binding.bindingExp :: dim_expl, binding.variability, Purity.PURE, varType));
+            binding.bindingType := Expression.typeOf(binding.bindingExp);
+          end if;
         end if;
       then
         ();

testsuite/openmodelica/cppruntime/VectorizedSolarSystem.mo

@@ -1,5 +1,5 @@
 package Vectorized
-  import SI = Modelica.SIunits;
+  import SI = Modelica.Units.SI;
 
   connector Terminal
     SI.Voltage v;
@@ -39,7 +39,7 @@ package Vectorized
     connect(plant.term, grid.terms);
   end SolarSystem;
 
-  annotation(uses(Modelica(version="3.2.3")));
+  annotation(uses(Modelica(version="4.0.0")));
 end Vectorized;
 
 model VectorizedSolarSystemTest = Vectorized.SolarSystem;

testsuite/openmodelica/cppruntime/testVectorizedBlocks.mos

@@ -95,8 +95,8 @@ val(y[10], 1.0);
 // 4: periodicClock1.useSolver:PARAM(final = true )  = true  "= true, if solverMethod shall be explicitly defined" type: Boolean
 // 5: periodicClock1.solverMethod:PARAM()  = "ImplicitEuler"  "Integration method used for discretized continuous-time partitions" type: String
 // 6: assignClock1.n:PARAM(min = 1 final = true )  = 10  "Size of input signal vector u (= size of output signal vector y)" type: Integer
-// 7: integrator1.k:PARAM(unit = fill("1", 10) )  = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}  "Integrator gain" type: Real[10] [10]
-// 8: integrator1.initType:PARAM(final = true )  = {Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState}  "Type of initialization (1: no init, 2: steady state, 3,4: initial output)" type: enumeration(NoInit, SteadyState, InitialState, InitialOutput)[10] [10]
+// 7: integrator1.k:PARAM(unit = "1" )  = 1.0  "Integrator gain" type: Real[10] [10]
+// 8: integrator1.initType:PARAM(final = true )  = Modelica.Blocks.Types.Init.InitialState  "Type of initialization (1: no init, 2: steady state, 3,4: initial output)" type: enumeration(NoInit, SteadyState, InitialState, InitialOutput)[10] [10]
 // 9: integrator1.y_start:PARAM()  = 1.0:10.0  "Initial or guess value of output (= state)" type: Real[10] [10]
 //
 //
@@ -174,8 +174,8 @@ val(y[10], 1.0);
 // Known variables only depending on parameters and constants - globalKnownVars (9)
 // ========================================
 // 1: integrator1.y_start:PARAM()  = 1.0:10.0  "Initial or guess value of output (= state)" type: Real[10] [10]
-// 2: integrator1.initType:PARAM(final = true )  = {Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState, Modelica.Blocks.Types.Init.InitialState}  "Type of initialization (1: no init, 2: steady state, 3,4: initial output)" type: enumeration(NoInit, SteadyState, InitialState, InitialOutput)[10] [10]
-// 3: integrator1.k:PARAM(unit = {"1", "1", "1", "1", "1", "1", "1", "1", "1", "1"} )  = {1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0}  "Integrator gain" type: Real[10] [10]
+// 2: integrator1.initType:PARAM(final = true )  = Modelica.Blocks.Types.Init.InitialState  "Type of initialization (1: no init, 2: steady state, 3,4: initial output)" type: enumeration(NoInit, SteadyState, InitialState, InitialOutput)[10] [10]
+// 3: integrator1.k:PARAM(unit = "1" )  = 1.0  "Integrator gain" type: Real[10] [10]
 // 4: assignClock1.n:PARAM(min = 1 final = true )  = 10  "Size of input signal vector u (= size of output signal vector y)" type: Integer
 // 5: periodicClock1.solverMethod:PARAM()  = "ImplicitEuler"  "Integration method used for discretized continuous-time partitions" type: String
 // 6: periodicClock1.useSolver:PARAM(final = true )  = true  "= true, if solverMethod shall be explicitly defined" type: Boolean