Two more passes: simplify expressions and move initializers; parserUnroll still commented-out

Author: mbudiu-vmw

Makefile.am

@@ -57,7 +57,7 @@ $(srcdir)/otherMakefiles.am: $(srcdir)/backends $(srcdir)/extensions $(wildcard
 # make is very stupid regarding multiple files generated from the same source
 # this pattern ensures that parallel builds continue to work
 ir/ir-generated.h: irgenerator $(ir_DEF_FILES)
-	./irgenerator -t ir/gen-tree-macro.h -i ir/ir-generated.cpp $(ir_DEF_FILES) >$@
+	./irgenerator -t ir/gen-tree-macro.h -i ir/ir-generated.cpp $(ir_DEF_FILES) >$@ || ( rm $@ && false )
 	@$(srcdir)/tools/fixup-line-directives $@ >$@.tmp
 	@mv $@.tmp $@
 ir/gen-tree-macro.h: ir/ir-generated.h

backends/bmv2/inlining.cpp

@@ -37,7 +37,7 @@ const IR::Node* SimpleControlsInliner::preorder(IR::P4Control* caller) {
     workToDo = &toInline->callerToWork[orig];
     LOG1("Simple inliner " << caller);
     auto stateful = new IR::IndexedVector<IR::Declaration>();
-    for (auto s : *caller->stateful) {
+    for (auto s : *caller->controlLocals) {
         auto inst = s->to<IR::Declaration_Instance>();
         if (inst == nullptr ||
             workToDo->declToCallee.find(inst) == workToDo->declToCallee.end()) {
@@ -63,7 +63,7 @@ const IR::Node* SimpleControlsInliner::preorder(IR::P4Control* caller) {
             auto clone = callee->getNode()->apply(sp);
             if (clone == nullptr)
                 return caller;
-            for (auto i : *clone->to<IR::P4Control>()->stateful) {
+            for (auto i : *clone->to<IR::P4Control>()->controlLocals) {
                 if (stateful->getDeclaration(i->name) == nullptr)
                     stateful->push_back(i);
             }

backends/bmv2/jsonconverter.cpp

@@ -999,8 +999,12 @@ cstring JsonConverter::convertHashAlgorithm(cstring algorithm) const {
     cstring result;
     if (algorithm == v1model.algorithm.crc32.name)
         result = "crc32";
+    else if (algorithm == v1model.algorithm.crc32_custom.name)
+        result = "crc32_custom";
     else if (algorithm == v1model.algorithm.crc16.name)
         result = "crc16";
+    else if (algorithm == v1model.algorithm.crc16_custom.name)
+        result = "crc16_custom";
     else if (algorithm == v1model.algorithm.random.name)
         result = "random";
     else if (algorithm == v1model.algorithm.identity.name)
@@ -1348,7 +1352,7 @@ Util::IJson* JsonConverter::convertControl(const IR::ControlBlock* block, cstrin
         tables->append(exitTable);
     }
 
-    for (auto c : *cont->stateful) {
+    for (auto c : *cont->controlLocals) {
         if (c->is<IR::Declaration_Constant>() ||
             c->is<IR::Declaration_Variable>() ||
             c->is<IR::P4Action>() ||
@@ -1875,8 +1879,8 @@ Util::IJson* JsonConverter::convertDeparser(const IR::P4Control* ctrl) {
 
 Util::IJson* JsonConverter::toJson(const IR::P4Parser* parser) {
     auto result = new Util::JsonObject();
-    if (parser->stateful->size() != 0) {
-        ::error("%1%: Stateful elements not yet supported in parser for this target", parser);
+    if (parser->parserLocals->size() != 0) {
+        ::error("%1%: locals not yet supported in parser for this target", parser);
         return result;
     }
     result->emplace("name", "parser");  // at least in simple_router this name is hardwired

backends/bmv2/midend.cpp

@@ -29,6 +29,7 @@ limitations under the License.
 #include "midend/removeLeftSlices.h"
 #include "midend/convertEnums.h"
 #include "midend/simplifyKey.h"
+#include "midend/simplifyExpressions.h"
 #include "frontends/p4/strengthReduction.h"
 #include "frontends/p4/typeMap.h"
 #include "frontends/p4/evaluator/evaluator.h"
@@ -96,6 +97,9 @@ void MidEnd::setup_for_P4_16(CompilerOptions& options) {
         new P4::UniqueNames(&refMap, isv1),
         // Move all local declarations to the beginning
         new P4::MoveDeclarations(),
+        new P4::MoveInitializers(),
+        new P4::TypeChecking(&refMap, &typeMap, false, isv1),
+        new P4::SimplifyExpressions(&refMap, &typeMap),
         new P4::ResolveReferences(&refMap, isv1),
         new P4::RemoveReturns(&refMap),
         // Move some constructor calls into temporaries

backends/bmv2/run-bmv2-test.py

@@ -717,7 +717,7 @@ def main(argv):
             else:
                 options.compilerOptions += argv[1].split();
                 argv = argv[1:]
-        elif argv[0][1] == 'T':
+        elif argv[0][1] == 'D' or argv[0][1] == 'I' or argv[0][1] == 'T':
             options.compilerOptions.append(argv[0]);
         else:
             reportError("Uknown option ", argv[0])

backends/ebpf/ebpfControl.cpp

@@ -295,7 +295,7 @@ void EBPFControl::emitDeclaration(const IR::Declaration* decl, CodeBuilder* buil
 }
 
 void EBPFControl::emit(CodeBuilder* builder) {
-    for (auto a : *controlBlock->container->stateful)
+    for (auto a : *controlBlock->container->controlLocals)
         emitDeclaration(a, builder);
     builder->emitIndent();
     ControlBodyTranslationVisitor psi(this, builder);

backends/ebpf/midend.cpp

@@ -25,6 +25,7 @@ limitations under the License.
 #include "midend/localizeActions.h"
 #include "midend/removeParameters.h"
 #include "midend/local_copyprop.h"
+#include "midend/simplifyExpressions.h"
 #include "frontends/p4/typeMap.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "frontends/p4/typeChecking/typeChecker.h"
@@ -53,6 +54,9 @@ const IR::ToplevelBlock* MidEnd::run(EbpfOptions& options, const IR::P4Program*
         new P4::UniqueNames(&refMap, isv1),
         // Move all local declarations to the beginning
         new P4::MoveDeclarations(),
+        new P4::MoveInitializers(),
+        new P4::TypeChecking(&refMap, &typeMap, false, isv1),
+        new P4::SimplifyExpressions(&refMap, &typeMap),
         new P4::ResolveReferences(&refMap, isv1),
         new P4::RemoveReturns(&refMap),  // necessary for inlining
         // Move some constructor calls into temporaries

backends/p4test/midend.cpp

@@ -28,6 +28,7 @@ limitations under the License.
 #include "midend/simplifyKey.h"
 #include "midend/parserUnroll.h"
 #include "midend/specialize.h"
+#include "midend/simplifyExpressions.h"
 #include "frontends/p4/typeMap.h"
 #include "frontends/p4/evaluator/evaluator.h"
 #include "frontends/p4/typeChecking/typeChecker.h"
@@ -45,7 +46,6 @@ MidEnd::MidEnd(CompilerOptions& options) {
     auto evaluator = new P4::Evaluator(&refMap, &typeMap);
     setName("MidEnd");
 
-    // TODO: break down expression into simple parts
     // TODO: def-use analysis
     // TODO: parser inlining
     // TODO: parser loop unrolling
@@ -61,6 +61,9 @@ MidEnd::MidEnd(CompilerOptions& options) {
         // Move all local declarations to the beginning
         new P4::MoveDeclarations(),
         new P4::MoveInitializers(),
+        // Simplify expressions
+        new P4::TypeChecking(&refMap, &typeMap, false, isv1),
+        new P4::SimplifyExpressions(&refMap, &typeMap),
         new P4::ResolveReferences(&refMap, isv1),
         new P4::RemoveReturns(&refMap),
         // Move some constructor calls into temporaries
@@ -87,10 +90,8 @@ MidEnd::MidEnd(CompilerOptions& options) {
         new P4::RemoveAllUnusedDeclarations(&refMap, isv1),
         new P4::SpecializeAll(&refMap, &typeMap, isv1),
         new P4::RemoveAllUnusedDeclarations(&refMap, isv1),
-        // TODO: simplify statements and expressions.
-        // This is required for the correctness of some of the following passes.
-        // Parser loop unrolling
-        new P4::ParserUnroll(true, &refMap, &typeMap, isv1),
+        // Parser loop unrolling: TODO
+        // new P4::ParsersUnroll(true, &refMap, &typeMap, isv1),
         // Clone an action for each use, so we can specialize the action
         // per user (e.g., for each table or direct invocation).
         new P4::LocalizeAllActions(&refMap, isv1),

backends/p4test/run-p4-sample.py

@@ -182,7 +182,7 @@ def process_file(options, argv):
     if options.verbose:
         print("Writing temporary files into ", tmpdir)
     ppfile = tmpdir + "/" + basename                  # after parsing
-    referenceOutputs = "FrontEnd_13,FrontEnd_14,MidEnd_43_Evaluator"
+    referenceOutputs = "FrontEnd_13,FrontEnd_14,MidEnd_45_Evaluator"
     stderr = tmpdir + "/" + basename + "-stderr"
 
     if not os.path.isfile(options.p4filename):
@@ -217,7 +217,7 @@ def process_file(options, argv):
         newName = file_name(tmpdir, base, "-frontend", ext)
         os.rename(midFile, newName)
         lastFile = newName
-    endFile = file_name(tmpdir, base, "-MidEnd_43_Evaluator", ext)
+    endFile = file_name(tmpdir, base, "-MidEnd_45_Evaluator", ext)
     if os.path.isfile(endFile):
         newName = file_name(tmpdir, base, "-midend", ext)
         os.rename(endFile, newName)

configure.ac

@@ -18,7 +18,9 @@ AC_LANG(C++)
 
 AC_CHECK_FUNCS([clock_gettime])
 AC_CHECK_FUNCS([memchr])
+AC_CHECK_FUNCS([memrchr])
 AC_CHECK_FUNCS([memset])
+AC_CHECK_FUNCS([pipe2])
 AC_CHECK_FUNCS([select])
 AC_CHECK_FUNCS([strchr])
 AC_CHECK_FUNCS([strcspn])
@@ -79,7 +81,7 @@ AX_PYTHON_MODULE([re], [fatal], [python])
 dnl The following lines are just including all "addconfig.ac" files
 dnl found in subdirectories
 
-m4_foreach_w([ac_file],m4_esyscmd([find -name addconfig.ac]),
+m4_foreach_w([ac_file],m4_esyscmd([find . -name addconfig.ac]),
 [[#]] config from ac_file
 [sinclude(]ac_file[)]
 [[#]] end of ac_file

docs/README.md

@@ -72,17 +72,28 @@ Most dependences can be installed using `apt-get install`:
 
 ## OS X dependences
 
-Installing dependences on OS X:
+Installing on OS X:
 
-- You may need to install brew for useful utilities:
-  `sudo /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"`
+- Enable XCode's command-line tools:
+  ```
+  xcode-select --install
+  ```
 
-- `sudo brew install autoconf automake libtool boost`
+- Install Homebrew:
+  ```
+  sudo /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+  ```
+  Be sure to add `/usr/local/bin/` to your `$PATH`.
 
-- You can recompile the C++ garbage-collector from sources from `https://github.com/ivmai/bdwgc.git`
+- Install dependencies using Homebrew:
+  ```
+  brew install autoconf automake libtool boost bison pkg-config
+  ```
 
-- You can recompile GMP from sources `https://gmplib.org/download/gmp/gmp-6.1.0.tar.bz2` (you will need
-  to `configure --enable-cxx`)
+- Build the C++ garbage-collector (BDW-GC) from `https://github.com/ivmai/bdwgc.git`. Follow the build instructions in the [README](https://github.com/ivmai/bdwgc/blob/master/README.md) file; you will need to `configure --enable-cplus-plus`.
+
+- Build the GNU Multi Precision Arithmetic Library (GMP) from `https://gmplib.org/download/gmp/gmp-6.1.0.tar.bz2`.
+  Follow the instructions in the `INSTALL` file; you will need to `configure --enable-cxx`.
 
 # Development tools