For BMV2, try to compile the program after specializing it. (#144)

Author: fruffy

flay.cpp

@@ -101,8 +101,12 @@ int Flay::mainImpl(const CompilerResult &compilerResult) {
     const auto &flayOptions = FlayOptions::get();
 
     // If we write to the optimized program to file, also dump the program after the midend.
-    if (FlayOptions::get().optimizedOutputDir() != std::nullopt) {
-        auto midendOutputFile = FlayOptions::get().optimizedOutputDir().value() / "midend.p4";
+    auto optimizedOutputDir = flayOptions.optimizedOutputDir();
+    if (optimizedOutputDir != std::nullopt) {
+        if (!std::filesystem::exists(optimizedOutputDir.value())) {
+            std::filesystem::create_directory(optimizedOutputDir.value());
+        }
+        auto midendOutputFile = optimizedOutputDir.value() / "midend.p4";
         std::ofstream output(midendOutputFile);
         if (!output.is_open()) {
             ::error("Could not open file %1% for writing.", midendOutputFile.c_str());
@@ -189,6 +193,14 @@ std::optional<std::vector<AnalysisStatistics *>> optimizeProgramImpl(
         return std::nullopt;
     }
 
+    // If we write to the optimized program to file, also dump the program after the midend.
+    auto optimizedOutputDir = flayOptions.optimizedOutputDir();
+    if (optimizedOutputDir != std::nullopt) {
+        if (!std::filesystem::exists(optimizedOutputDir.value())) {
+            std::filesystem::create_directory(optimizedOutputDir.value());
+        }
+    }
+
     PartialEvaluationOptions partialEvaluationOptions;
     IncrementalAnalysisMap incrementalAnalysisMap;
     auto [result, inserted] = incrementalAnalysisMap.emplace(

targets/bmv2/test/BMv2V1ModelXfail.cmake

@@ -90,4 +90,19 @@ p4tools_add_xfail_reason(
   "Reachability mapping for node .* already exists"
 )
 
-
+p4tools_add_xfail_reason(
+  "flay-bmv2-v1model"
+  "Failed BMv2 compilation."
+  # This test uses a feature currently unsupported in the BMv2 back-end.
+  issue907-bmv2.p4
+  # These tests use a table key with type 'error'
+  issue1062-bmv2.p4
+  # This reads stack.next
+  issue692-bmv2.p4
+  # These test use computations in the verify/update checksum controls - unsupported
+  issue1765-1-bmv2.p4
+  # This test tries to hash (via the hash extern) a value that isn't a tuple - unsupported
+  hashing-non-tuple-bmv2.p4
+  # Similarly, this test hashes on a bit input.
+  issue584-1-bmv2.p4
+)

targets/bmv2/test/TestTemplate.cmake

@@ -45,7 +45,9 @@ function(p4tools_add_test_with_args)
   endif()
 
   file(APPEND ${__testfile} "${driver} --target ${target} --arch ${arch} "
-                            "${test_args} \"$@\" --file ${p4test}\n"
+                            "${test_args} \"$@\" --file ${p4test} --optimized-output-dir ${__testfolder}\n")
+  file(APPEND ${__testfile} "${CMAKE_BINARY_DIR}/p4c-bm2-ss --target ${target} --arch ${arch} "
+                            "${__testfolder}/optimized.final.p4 || echo \"Failed BMv2 compilation.\"\n"
   )
 
   execute_process(COMMAND chmod +x ${__testfile})