OID: Make CodeGen v2 (TypeGraph) the default

facebookexperimental · Dec 14, 2023 · c874f72 · c874f72
1 parent 35afd15
commit c874f72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,41 +11,43 @@ workflows:
           cxx: /usr/bin/g++
           warnings_as_errors: "OFF"
       - test:
-          name: test-gcc
+          name: test-codegenv1-gcc
           requires:
             - build-gcc
+          oid_test_args: "-Ftype-graph"
+          tests_regex: "OilIntegration\\..*"
       - test:
-          name: test-type-graph-gcc
+          name: test-gcc
           requires:
             - build-gcc
-          oid_test_args: "-ftype-graph"
           tests_regex: "OidIntegration\\..*"
           exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0"
       - coverage:
           name: coverage
           requires:
             - test-gcc
       - coverage:
-          name: coverage-type-graph
+          name: coverage-codegenv1
           requires:
-            - test-type-graph-gcc
+            - test-codegenv1-gcc
 
       - build:
           name: build-clang
           cc: /usr/bin/clang-12
           cxx: /usr/bin/clang++-12
           warnings_as_errors: "ON"
       - test:
-          name: test-clang
+          name: test-codegenv1-clang
           requires:
             - build-clang
+          oid_test_args: "-Ftype-graph"
+          tests_regex: "OilIntegration\\..*"
           # Tests disabled due to bad DWARF generated by the old clang compiler in CI
           exclude_regex: "OilIntegration.fbstring_.*|OilIntegration.capture_keys_string|OilIntegration.capture_keys_multi_level"
       - test:
-          name: test-type-graph-clang
+          name: test-clang
           requires:
             - build-clang
-          oid_test_args: "-ftype-graph"
           tests_regex: "OidIntegration\\..*"
           # Tests disabled due to bad DWARF generated by the old clang compiler in CI
           exclude_regex: ".*inheritance_polymorphic.*|.*arrays_member_int0|.*fbstring.*|.*std_string_*|.*multi_arg_tb_.*|.*ignored_a"

diff --git a/oi/OID.cpp b/oi/OID.cpp
@@ -516,6 +516,7 @@ int main(int argc, char* argv[]) {
   std::map<Feature, bool> features = {
       {Feature::PackStructs, true},
       {Feature::GenPaddingStats, true},
+      {Feature::TypeGraph, true},
       {Feature::PruneTypeGraph, true},
   };