Synth scheduling implementation PR

aps2scala/Makefile

@@ -1,7 +1,7 @@
 CPP=g++ 
 CPPFLAGS=-Wall -g -Wno-unused-variable -DUSING_CXX -DAPS2SCALA -I../parse -I../analyze -I../codegen -I../utilities
 
-APS2SCALAOBJS = aps2scala.o dump-scala.o implement.o dyn-impl.o static-impl.o static-scc-impl.o
+APS2SCALAOBJS = aps2scala.o dump-scala.o implement.o dyn-impl.o static-impl.o static-scc-impl.o synth-impl.o
 APS2SCALALIBS = ../lib/aps-lib.o ../lib/aps-ag.a ../utilities/utilities.o
 aps2scala : ${APS2SCALAOBJS} ${APS2SCALALIBS}
 	${CPP} ${CPPFLAGS} ${APS2SCALAOBJS} ${APS2SCALALIBS} -o aps2scala
@@ -11,6 +11,9 @@ ${APS2SCALAOBJS} : dump-scala.h
 install: aps2scala
 	mv aps2scala ../bin/.
 
+synth-impl.o : ../codegen/synth-impl.cc 
+	${CPP} -c ${CPPFLAGS} $< -o $@
+
 static-impl.o : ../codegen/static-impl.cc 
 	${CPP} -c ${CPPFLAGS} $< -o $@
 

aps2scala/aps2scala.cc

@@ -29,6 +29,8 @@ void usage() {
   fprintf(stderr,"    -V    increase verbosity of generation code\n");
   fprintf(stderr,"    -G    add Debug calls for every function\n");
   fprintf(stderr,"    -C    SCC chunk static scheduling\n");
+  fprintf(stderr,"    -F,  --synth optimized SYNTH evaluation\n");
+  fprintf(stderr,"    -F0, --synth-original generate Farrow-style SYNTH evaluation\n");
   fprintf(stderr,"    -p path set the APSPATH (overriding env. variable)\n");
   exit(1);
 }
@@ -40,6 +42,9 @@ extern int aps_yyparse(void);
 Implementation* impl;
 bool static_schedule = false;
 bool is_tree_only_program = false;
+bool synth_implementation = false;
+// False runs related child cycles until values reaches fixed-point and always re-runs independent child cycles.
+bool farrow_synth_improvements = true;
 
 static void* program_is_tree_only(void *scope, void *node) {
   if (ABSTRACT_APS_tnode_phylum(node) == KEYDeclaration) {
@@ -82,6 +87,15 @@ int main(int argc,char **argv) {
       static_schedule = true;
       static_scc_schedule = true;
       continue;
+    } else if (streq(argv[i],"-F") || streq(argv[i],"--synth")) {
+      synth_implementation = true;
+      anc_analysis = true;
+      continue;
+    } else if (streq(argv[i],"-F0") || streq(argv[i],"--synth-original")) {
+      synth_implementation = true;
+      anc_analysis = true;
+      farrow_synth_improvements = false;
+      continue;
     } else if (streq(argv[i],"-V") || streq(argv[i],"--verbose")) {
       ++verbose;
       continue;
@@ -110,8 +124,12 @@ int main(int argc,char **argv) {
     type_Program(p);
     traverse_Program(program_is_tree_only, p, p);
     aps_check_error("type");
-    if (static_schedule) {
-      impl = static_scc_schedule ? static_scc_impl : static_impl;
+    if (static_schedule || synth_implementation) {
+      if (static_schedule) {
+        impl = static_scc_schedule ? static_scc_impl : static_impl;
+      } else {
+        impl = synth_impl;
+      }
       analyze_Program(p);
       aps_check_error("analysis");
       if (!impl) {

aps2scala/dump-scala.cc

@@ -1681,7 +1681,7 @@ void dump_scala_Declaration(Declaration decl,ostream& oss)
       ++nesting_level;
 
       STATE *s = (STATE*)Declaration_info(decl)->analysis_state;
-      if (static_scc_schedule && s != NULL)
+      if ((static_scc_schedule || anc_analysis) && s != NULL)
       {
         activate_static_circular = s->loop_required;
       }
@@ -2455,6 +2455,11 @@ void dump_Expression(Expression e, ostream& o)
       dump_collect_Actuals(infer_expr_type(e),funcall_actuals(e),o);
       return;
     }
+
+    if (auto* synth = dynamic_cast<SynthImplementation*>(impl)) {
+      if (synth->try_dump_funcall(e, o)) return;
+    }
+
     bool dump_anchor_actual = false;
     if (should_include_ast_for_objects()) {
       Expression fexpr = funcall_f(e);
@@ -2691,7 +2696,7 @@ string operator+(string s, int i)
 string indent(int nl) { return string(indent_multiple*nl,' '); }
 
 bool check_surrounding_decl(void* node, KEYTYPE_Declaration decl_key, Declaration* result_decl) {
-  while (node != NULL) {
+  while (node != NULL && ABSTRACT_APS_tnode_phylum(node) != KEY_ABSTRACT_APS_None) {
     if (ABSTRACT_APS_tnode_phylum(node) == KEYDeclaration) {
       Declaration decl = (Declaration)node;
       if (Declaration_KEY(decl) == decl_key) {
@@ -2705,3 +2710,16 @@ bool check_surrounding_decl(void* node, KEYTYPE_Declaration decl_key, Declaratio
   *result_decl = NULL;
   return false;
 }
+
+bool check_surrounding_node(void* node, KEYTYPE_ABSTRACT_APS_Phylum ast_key, void** result_node) {
+  while (node != NULL && ABSTRACT_APS_tnode_phylum(node) != KEY_ABSTRACT_APS_None) {
+    if (ABSTRACT_APS_tnode_phylum(node) == ast_key) {
+      *result_node = node;
+      return true;
+    }
+    node = tnode_parent(node);
+  }
+
+  *result_node = NULL;
+  return false;
+}

aps2scala/dump-scala.h

@@ -17,6 +17,7 @@ extern int verbose;
 extern int debug;
 extern bool include_comments;
 extern bool static_scc_schedule;
+extern bool anc_analysis;
 
 class Implementation;
 

codegen/dump.h

@@ -1,6 +1,8 @@
 #ifndef DUMP_H
+#include "implement.h"
 #include <iostream>
 #include <string>
+#include <vector>
 
 using std::ostream;
 using std::string;
@@ -13,6 +15,7 @@ void impl_module(const char *name, const char *type);
 
 extern bool incremental;
 extern bool static_schedule;
+extern bool farrow_synth_improvements;
 extern int verbose;
 extern int debug;
 extern bool include_comments;
@@ -196,4 +199,8 @@ inline const output_streams& operator<< <header_end>
 }
 #endif /* APS2SCALA */
 
+// Common code generation utility functions
+extern bool check_surrounding_decl(void* node, KEYTYPE_Declaration decl_key, Declaration* result_decl);
+extern bool check_surrounding_node(void* node, KEYTYPE_ABSTRACT_APS_Phylum ast_key, void** result_node);
+
 #endif

codegen/implement.h

@@ -70,9 +70,16 @@ class Implementation {
   virtual void implement_value_use(Declaration vd, ostream&) = 0;
 };
 
+class SynthImplementation : public Implementation {
+ public:
+  virtual bool try_dump_funcall(Expression, ostream&) = 0;
+  virtual void dump_synth_instance(INSTANCE*, ostream&) = 0;
+};
+
 extern Implementation *dynamic_impl;
 extern Implementation *static_impl;
 extern Implementation *static_scc_impl;
+extern Implementation *synth_impl;
 
 #define IMPLEMENTATION_MARKS (127<<24)