Changeset 11581

Timestamp:

Sep 13, 2018 3:27:45 PM (15 months ago)

Author:

Jonathan Kämpe

Message:

#5670 Fixed function inlining and code generation bug introduced in r11578

Location:

trunk/Compiler

Files:

• ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExpressions.jrag (modified) (2 diffs)
• ModelicaCBackEnd/test/modelica/CCodeGenGlobalsTests.mo (modified) (1 diff)
• ModelicaMiddleEnd/src/jastadd/optimizations/InlineFunctions.jrag (modified) (1 diff)
• ModelicaMiddleEnd/test/modelica/FunctionInlining.mo (modified) (1 diff)

trunk/Compiler/ModelicaCBackEnd/src/jastadd/CCodeGen/CCodeGenExpressions.jrag

@@ -701 +701 @@
 
     syn String FAccess.toString_C(CodePrinter.ExecuteCodePrinter p) {
+        return myFV().genUse_C(p, asFAccess().getFArraySubscripts(), myFV().funcArrayType(isAssignUse()));
+    }
+
+    syn String FAccessFull.toString_C(CodePrinter.ExecuteCodePrinter p) {
+        if (getNumFAccessPart() < 2) {
+            return super.toString_C(p);
+        }
+        
         String type = myFV().funcArrayType(isAssignUse());
-        if (myFV().inRecord() && inFunction()) {
-            return asFAccess().genRecordUse_C(p, asFAccess().myOutermostFV(), type);
-        } else {
-            return myFV().genUse_C(p, asFAccess().getFArraySubscripts(), type);
-        }
+        FAccessPart part = getFAccessPart(0);
+        FArraySubscripts fas = part.hasFArraySubscripts() ? part.getFArraySubscripts() : null;
+        String res = myOutermostFV().genUse_C(p, fas, C_ARRAY_RECORD);
+        for (int i = 1, n = getNumFAccessPart(); i < n; i++) {
+            part = getFAccessPart(i);
+            res = res + "->" + part.getName();
+            if (part.hasFArraySubscripts()) {
+                String curType = (n - i > 1 ? C_ARRAY_RECORD : type);
+                res = part.getFArraySubscripts().genFunctionArrayUse_C(p.codePrinter(), res, curType);
+            }
+        }
+        return res;
     }
 
@@ -734 +749 @@
     public void FArraySubscripts.prettyPrint_C(CodePrinter p, CodeStream str, String indent) {
         getFSubscripts().prettyPrintWithSep(p, str, "", ", ");
-    }
-
-    /**
-     * Helper, generates an record variable use
-     */
-    public String FAccess.genRecordUse_C(CodePrinter.ExecuteCodePrinter p, FAbstractVariable fv, String type) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * Helper, generates an record variable use
-     */
-    @Override
-    public String FAccessFull.genRecordUse_C(CodePrinter.ExecuteCodePrinter p, FAbstractVariable fv, String type) {
-        FAccessPart part = getFAccessPart(0);
-        FArraySubscripts fas = part.hasFArraySubscripts() ? part.getFArraySubscripts() : null;
-        String res = fv.genUse_C(p, fas, C_ARRAY_RECORD);
-        for (int i = 1, n = getNumFAccessPart(); i < n; i++) {
-            part = getFAccessPart(i);
-            res = res + "->" + part.getName();
-            if (part.hasFArraySubscripts()) {
-                String curType = (n - i > 1 ? C_ARRAY_RECORD : type);
-                res = part.getFArraySubscripts().genFunctionArrayUse_C(p.codePrinter(), res, curType);
-            }
-        }
-        return res;
     }
 

trunk/Compiler/ModelicaCBackEnd/test/modelica/CCodeGenGlobalsTests.mo

@@ -2193 +2193 @@
 ")})));
 end GlobalConstantRef2;
+
+model GlobalConstantRef3
+    
+    constant R1[1] r = {R1(2)};
+    record R1
+        parameter Real x;
+    end R1;
+    function f
+        input Integer i;
+        output Real y = 1 + r[i].x;
+    algorithm
+    end f;
+    
+    Real y = f(integer(time));
+
+annotation(__JModelica(UnitTesting(tests={
+    CCodeGenTestCase(
+        name="GlobalConstantRef3",
+        description="",
+        template="
+$C_global_temps$
+$C_set_globals_start$
+$C_functions$
+$C_ode_derivatives$
+",
+        generatedCode="
+    R1_0_ra* CCodeGenGlobalsTests_GlobalVariables_GlobalConstantRef3_r;
+
+R1_0_ra* jmi_global_tmp_1(jmi_t* jmi) {
+    JMI_DYNAMIC_INIT()
+    JMI_ARR(DYNA, R1_0_r, R1_0_ra, tmp_1, 1, 1)
+    JMI_GLOBALS_INIT()
+    JMI_ARRAY_INIT_1(DYNA, R1_0_r, R1_0_ra, tmp_1, 1, 1, 1)
+    jmi_array_rec_1(tmp_1, 1)->x = AD_WRAP_LITERAL(2);
+    JMI_GLOBALS_FREE()
+    JMI_DYNAMIC_FREE()
+    return tmp_1;
+}
+
+int jmi_set_globals_start_0(jmi_t* jmi) {
+    int ef = 0;
+    JMI_DYNAMIC_INIT()
+    JMI_GLOBAL(CCodeGenGlobalsTests_GlobalVariables_GlobalConstantRef3_r) = jmi_global_tmp_1(jmi);
+    JMI_DYNAMIC_FREE()
+    return ef;
+}
+
+int jmi_set_globals_start_0(jmi_t* jmi);
+
+int jmi_set_globals_start(jmi_t* jmi) {
+    int ef = 0;
+    JMI_DYNAMIC_INIT()
+    ef |= jmi_set_globals_start_0(jmi);
+    JMI_DYNAMIC_FREE()
+    return ef;
+}
+
+
+
+int model_ode_derivatives_base(jmi_t* jmi) {
+    int ef = 0;
+    JMI_DYNAMIC_INIT()
+    if (jmi->atInitial || jmi->atEvent) {
+        _sw(0) = jmi_turn_switch_time(jmi, _time - (pre_temp_1_2), _sw(0), JMI_REL_LT);
+    }
+    if (jmi->atInitial || jmi->atEvent) {
+        _sw(1) = jmi_turn_switch_time(jmi, _time - (pre_temp_1_2 + AD_WRAP_LITERAL(1)), _sw(1), JMI_REL_GEQ);
+    }
+    _temp_1_2 = COND_EXP_EQ(LOG_EXP_OR(LOG_EXP_OR(_sw(0), _sw(1)), _atInitial), JMI_TRUE, floor(_time), pre_temp_1_2);
+    pre_temp_1_2 = _temp_1_2;
+    _y_1 = 1 + jmi_array_rec_1(JMI_GLOBAL(CCodeGenGlobalsTests_GlobalVariables_GlobalConstantRef3_r), _temp_1_2)->x;
+    JMI_DYNAMIC_FREE()
+    return ef;
+}
+")})));
+end GlobalConstantRef3;
 
 model GlobalConstantExternalObject1

trunk/Compiler/ModelicaMiddleEnd/src/jastadd/optimizations/InlineFunctions.jrag

@@ -1553 +1553 @@
     @Override
     public FExp FGlobalAccessExp.replaceReferences(AbstractFunctionInliner fi) {
-        FExp res = dynamicFExp(treeCopy());
-        for (ASTNode n : res) {
-            n.replaceReferences(fi);
-        }
-        return res;
+        replaceReferencesInSubscripts(fi);
+        return this;
     }
 

trunk/Compiler/ModelicaMiddleEnd/test/modelica/FunctionInlining.mo

@@ -5070 +5070 @@
 end GlobalConst2;
 
+model GlobalConst3
+    constant R1[1] r = {R1(2)};
+    record R1
+        parameter Real x;
+    end R1;
+    function f
+        input Integer i;
+        output Real y = 1 + r[i].x;
+    algorithm
+    end f;
+    
+    Real y = f(integer(time));
+
+    annotation(__JModelica(UnitTesting(tests={
+        TransformCanonicalTestCase(
+            name="GlobalConst3",
+            description="Inlining global constant",
+            variability_propagation=false,
+            flatModel="
+fclass FunctionInlining.GlobalConst3
+ constant Real r[1].x = 2;
+ Real y;
+ discrete Integer temp_1;
+package constant
+ constant FunctionInlining.GlobalConst3.R1 FunctionInlining.GlobalConst3.r[1] = {FunctionInlining.GlobalConst3.R1(2)};
+initial equation
+ pre(temp_1) = 0;
+equation
+ y = 1 + global(FunctionInlining.GlobalConst3.r[temp_1].x);
+ temp_1 = if time < pre(temp_1) or time >= pre(temp_1) + 1 or initial() then integer(time) else pre(temp_1);
+
+public
+ record FunctionInlining.GlobalConst3.R1
+  parameter Real x;
+ end FunctionInlining.GlobalConst3.R1;
+
+end FunctionInlining.GlobalConst3;
+")})));
+end GlobalConst3;
+
 model GlobalConstExtObj1
     package P