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 farrow-impl.o synth-util.o
+APS2SCALAOBJS = aps2scala.o dump-scala.o implement.o dyn-impl.o static-impl.o static-scc-impl.o farrow-impl.o synth-util.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 ../codegen/synth-util.h
+	${CPP} -c ${CPPFLAGS} $< -o $@
+
 static-impl.o : ../codegen/static-impl.cc 
 	${CPP} -c ${CPPFLAGS} $< -o $@
 

aps2scala/aps2scala.cc

@@ -5,6 +5,7 @@ extern "C" {
 #include <cstring>
 #include <strings.h>
 #include "aps-ag.h"
+#include "aps-analyze.h"
 }
 #include <iostream>
 #include <fstream>
@@ -29,7 +30,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,"    -F0, --synth-pure-farrow generate original Farrow SYNTH evaluation\n");
+  fprintf(stderr,"    -A,  --synth optimized SYNTH evaluation\n");
+  fprintf(stderr,"    -F,  --synth-pure-farrow generate original Farrow SYNTH evaluation\n");
   fprintf(stderr,"    -p path set the APSPATH (overriding env. variable)\n");
   exit(1);
 }
@@ -41,6 +43,7 @@ extern int aps_yyparse(void);
 Implementation* impl;
 bool static_schedule = false;
 bool is_tree_only_program = false;
+bool synth_implementation = false;
 bool farrow_implementation = false;
 
 static void* program_is_tree_only(void *scope, void *node) {
@@ -84,7 +87,11 @@ int main(int argc,char **argv) {
       static_schedule = true;
       static_scc_schedule = true;
       continue;
-    } else if (streq(argv[i],"-F0") || streq(argv[i],"--synth-pure-farrow")) {
+    } else if (streq(argv[i],"-A") || streq(argv[i],"--synth")) {
+      synth_implementation = true;
+      anc_analysis = true;
+      continue;
+    } else if (streq(argv[i],"-F") || streq(argv[i],"--farrow")) {
       farrow_implementation = true;
       anc_analysis = true;
       continue;
@@ -116,14 +123,16 @@ int main(int argc,char **argv) {
     type_Program(p);
     traverse_Program(program_is_tree_only, p, p);
     aps_check_error("type");
-    if (static_schedule || farrow_implementation) {
-      if (farrow_implementation) {
-		  impl = farrow_impl;
-	  } else if (static_scc_schedule) {
-		  impl = static_scc_impl;
-	  } else {
-		  impl = static_impl;
-	  }
+    if (static_schedule || static_scc_schedule || farrow_implementation || synth_implementation) {
+      if (synth_implementation) {
+        impl = synth_impl;
+      } else if (farrow_implementation) {
+        impl = farrow_impl;
+      } else if (static_scc_schedule) {
+        impl = static_scc_impl;
+      } else {
+        impl = static_impl;
+      }
       analyze_Program(p);
       aps_check_error("analysis");
       if (!impl) {

aps2scala/dump-scala.cc

@@ -11,6 +11,7 @@ extern "C" {
 #include <stdio.h>
 #include "string.h"
 #include "aps-ag.h"
+#include "aps-analyze.h"
 String get_code_name(Symbol);
 }
 

codegen/farrow-impl.cc

@@ -64,7 +64,7 @@ static void dump_farrow_functions(STATE* s, ostream& os) {
   ostream& oss = os;
   os << "\n";
 
-  synth_functions_states = synth_util::build_synth_function_states(s);
+  synth_functions_states = synth_util::build_synth_function_states(s, false);
   bool needs_fixed_point = s->loop_required;
 
   for (auto state_it = synth_functions_states.begin(); state_it != synth_functions_states.end(); state_it++) {