opt and dbg compile in OSX

Author: renau

MODULE.bazel

@@ -3,26 +3,21 @@
 # Using bazel 7 or newer and pointing to https://registry.bazel.build/
 #
 
-bazel_dep(name = "rules_foreign_cc", version = "0.11.1")
+bazel_dep(name = "rules_cc", version = "0.1.1")
+bazel_dep(name = "rules_foreign_cc", version = "0.14.0")
+
+bazel_dep(name = "abseil-cpp", version = "20250127.0") # version = "20240722.1")
+bazel_dep(name = "google_benchmark", version = "1.9.1")
+bazel_dep(name = "googletest", version = "1.16.0")
+bazel_dep(name = "rules_proto_grpc_cpp", version = "5.0.1")
+bazel_dep(name = "rules_proto", version = "7.1.0")
+bazel_dep(name = "protobuf", version = "30.1")
 
 #### M4/Flex/Bison
 bazel_dep(name = "rules_m4", version = "0.2.4")
-
 bazel_dep(name = "rules_flex", version = "0.2.1")
-
 bazel_dep(name = "rules_bison", version = "0.3")
 
-# google benchmark
-bazel_dep(name = "google_benchmark", version = "1.9.1")
-
-# rapidjson
 bazel_dep(name = "rapidjson", version = "1.1.0.bcr.20241007")
-
-# mimalloc (only seems to work in Linux)
 bazel_dep(name = "mimalloc", version = "2.1.7-bcr.alpha.1")
 
-# abseil
-bazel_dep(name = "abseil-cpp", version = "20240722.1")
-
-# googletest
-bazel_dep(name = "googletest", version = "1.15.2")

WORKSPACE

@@ -4,7 +4,6 @@ workspace(name = "livehd")
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 new_git_repository(
     name = "abc",
@@ -107,10 +106,10 @@ http_archive(
 # HIF
 http_archive(
     name = "hif",
-    sha256 = "bf4d0d5e06b100b616c35b8fc1601de482ea0dfc7b8f0f75763f9b9020076626",
-    strip_prefix = "hif-11b5dc3eda963fe5220345dac7fa2ccc68545182",
+    sha256 = "9d65753cc06e02b7d8f795ed6f3286861879877f5928a793e1048f8b8433b9d7",
+    strip_prefix = "hif-9b731a9feeba0faa268fbc59b722f6f7ce5f387a",
     urls = [
-        "https://github.com/masc-ucsc/hif/archive/11b5dc3eda963fe5220345dac7fa2ccc68545182.zip",
+        "https://github.com/masc-ucsc/hif/archive/9b731a9feeba0faa268fbc59b722f6f7ce5f387a.zip",
     ],
 )
 
@@ -196,49 +195,6 @@ http_archive(
     ],
 )
 
-# Protobuf
-http_archive(
-    name = "rules_proto_grpc",
-    sha256 = "9ba7299c5eb6ec45b6b9a0ceb9916d0ab96789ac8218269322f0124c0c0d24e2",
-    strip_prefix = "rules_proto_grpc-4.5.0",
-    urls = ["https://github.com/rules-proto-grpc/rules_proto_grpc/releases/download/4.5.0/rules_proto_grpc-4.5.0.tar.gz"],
-)
-
-load("@rules_proto_grpc//:repositories.bzl", "rules_proto_grpc_repos", "rules_proto_grpc_toolchains")
-
-rules_proto_grpc_toolchains()
-
-rules_proto_grpc_repos()
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
-rules_proto_dependencies()
-
-rules_proto_toolchains()
-# http_archive(
-#     name = "rules_proto",
-#     sha256 = "fea00227e78467fc8ab6a17f7de26489b7dcb3b773659cf6d9906251e521cfe9",
-#     strip_prefix = "rules_proto-aaa54ca64e87699276b6f64e22ce800fae3637b5",
-#     urls = [
-#         "https://github.com/bazelbuild/rules_proto/archive/aaa54ca64e87699276b6f64e22ce800fae3637b5.zip",
-#     ],
-# )
-# load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-# rules_proto_dependencies()
-# rules_proto_toolchains()
-
-# http_archive(
-# name = "rules_proto",
-# sha256 = "e017528fd1c91c5a33f15493e3a398181a9e821a804eb7ff5acdd1d2d6c2b18d",
-# strip_prefix = "rules_proto-4.0.0-3.20.0",
-# urls = [
-#     "https://github.com/bazelbuild/rules_proto/archive/refs/tags/4.0.0-3.20.0.tar.gz",
-# ],
-# )
-# load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-# rules_proto_dependencies()
-# rules_proto_toolchains()
-
 # Perfetto
 http_archive(
     name = "com_google_perfetto",

inou/firrtl/BUILD

@@ -10,7 +10,7 @@ FIRRTL_TESTS = glob([
 proto_library(
     name = "firrtl_proto",
     srcs = ["firrtl.proto"],
-    deps = ["@com_google_protobuf//:any_proto"],
+    deps = ["@protobuf//:any_proto"],
 )
 
 cc_proto_library(

inou/firrtl/fir_tolnast.cpp

@@ -11,12 +11,12 @@
 
 #include "absl/strings/match.h"
 #include "firrtl.pb.h"
-#include "google/protobuf/util/time_util.h"
+// #include "google/protobuf/util/time_util.h"
 #include "inou_firrtl.hpp"
 #include "perf_tracing.hpp"
 #include "thread_pool.hpp"
 
-using google::protobuf::util::TimeUtil;
+// using google::protobuf::util::TimeUtil;
 
 /* For help understanding FIRRTL/Protobuf:
  * 1) Semantics regarding FIRRTL language:
@@ -246,9 +246,11 @@ uint16_t Inou_firrtl_module::get_vector_size(const Lnast& lnast, std::string_vie
   if (var2vec_size.find(vec_name) == var2vec_size.end()) {
     auto module_name = lnast.get_top_module_name();
 #ifndef NDEBUG
-    Pass::warn("Warning: the \"if\" statement below is to enable RocketTile LG generation. Remove the if block and use the assertion above it instead.\n");
+    Pass::warn(
+        "Warning: the \"if\" statement below is to enable RocketTile LG generation. Remove the if block and use the assertion "
+        "above it instead.\n");
 #endif
-    //I(Inou_firrtl::glob_info.module_var2vec_size.find(module_name) != Inou_firrtl::glob_info.module_var2vec_size.end());
+    // I(Inou_firrtl::glob_info.module_var2vec_size.find(module_name) != Inou_firrtl::glob_info.module_var2vec_size.end());
     if (Inou_firrtl::glob_info.module_var2vec_size.find(module_name) == Inou_firrtl::glob_info.module_var2vec_size.end()) {
       return 1;
     }
@@ -329,7 +331,7 @@ void Inou_firrtl_module::handle_register(Lnast& lnast, const firrtl::FirrtlPB_Ty
           = reg_bits > 0 ? true
                          : false;  // some chirrtl code don't have bits set on register, but must have bits set on init expression
       auto diff_type = type.type_case() != firrtl::FirrtlPB_Type::kUintType;
-      //setup_scalar_bits(lnast, absl::StrCat("#", id), reg_bits, parent_node, diff_type, stmt);
+      // setup_scalar_bits(lnast, absl::StrCat("#", id), reg_bits, parent_node, diff_type, stmt);
       setup_scalar_bits(lnast, id, reg_bits, parent_node, diff_type, stmt);
 
       setup_register_reset_init(lnast,
@@ -2276,7 +2278,7 @@ void Inou_firrtl_module::setup_register_q_pin(Lnast& lnast, Lnast_nid& parent_no
     fname                             = subtrngs[0];
   }
 
-  //auto flop_qpin_var = absl::StrCat("_#_", reg_name, "_q");
+  // auto flop_qpin_var = absl::StrCat("_#_", reg_name, "_q");
   auto flop_qpin_var = absl::StrCat("_#_", reg_name, "_q");
   auto idx_asg2      = lnast.add_child(parent_node, Lnast_node::create_assign("", 0, line_pos, col_pos, fname));
   lnast.add_child(idx_asg2, Lnast_node::create_ref(flop_qpin_var, 0, line_pos, col_pos, fname));
@@ -2299,8 +2301,8 @@ void Inou_firrtl_module::declare_register(Lnast& lnast, Lnast_nid& parent_node,
     fname                             = subtrngs[0];
   }
 
-  auto idx_attget         = lnast.add_child(parent_node, Lnast_node::create_attr_get("", 0, line_pos, col_pos, fname));
-  //auto full_register_name = absl::StrCat("#", reg_name);
+  auto idx_attget = lnast.add_child(parent_node, Lnast_node::create_attr_get("", 0, line_pos, col_pos, fname));
+  // auto full_register_name = absl::StrCat("#", reg_name);
   auto full_register_name = reg_name;
   auto tmp_var_str        = create_tmp_var();
   lnast.add_child(idx_attget, Lnast_node::create_ref(tmp_var_str, 0, line_pos, col_pos, fname));
@@ -2346,7 +2348,7 @@ void Inou_firrtl_module::setup_register_reset_init(Lnast& lnast, Lnast_nid& pare
   }
 
   if (!value_node.is_invalid()) {
-    //create_tuple_add_from_str(lnast, parent_node, absl::StrCat("#", reg_raw_name, ".__reset_pin"), value_node, stmt);
+    // create_tuple_add_from_str(lnast, parent_node, absl::StrCat("#", reg_raw_name, ".__reset_pin"), value_node, stmt);
     create_tuple_add_from_str(lnast, parent_node, absl::StrCat(reg_raw_name, ".__reset_pin"), value_node, stmt);
   }
 
@@ -2363,7 +2365,7 @@ void Inou_firrtl_module::setup_register_reset_init(Lnast& lnast, Lnast_nid& pare
 
     if (!bits_set_done) {
       auto bits = inite.uint_literal().width().value();
-      //setup_scalar_bits(lnast, absl::StrCat("#", reg_raw_name), bits, parent_node, false, stmt);
+      // setup_scalar_bits(lnast, absl::StrCat("#", reg_raw_name), bits, parent_node, false, stmt);
       setup_scalar_bits(lnast, reg_raw_name, bits, parent_node, false, stmt);
     }
   } else if (inite_case == firrtl::FirrtlPB_Expression::kSintLiteral) {
@@ -2372,7 +2374,7 @@ void Inou_firrtl_module::setup_register_reset_init(Lnast& lnast, Lnast_nid& pare
 
     if (!bits_set_done) {
       auto bits = inite.uint_literal().width().value();
-      //setup_scalar_bits(lnast, absl::StrCat("#", reg_raw_name), bits, parent_node, true, stmt);
+      // setup_scalar_bits(lnast, absl::StrCat("#", reg_raw_name), bits, parent_node, true, stmt);
       setup_scalar_bits(lnast, reg_raw_name, bits, parent_node, true, stmt);
     }
   } else if (inite_case == firrtl::FirrtlPB_Expression::kReference) {
@@ -2390,7 +2392,7 @@ void Inou_firrtl_module::setup_register_reset_init(Lnast& lnast, Lnast_nid& pare
   }
 
   if (!initial_node.is_invalid()) {
-    //create_tuple_add_from_str(lnast, parent_node, absl::StrCat("#", reg_raw_name, ".__initial"), initial_node, stmt);
+    // create_tuple_add_from_str(lnast, parent_node, absl::StrCat("#", reg_raw_name, ".__initial"), initial_node, stmt);
     create_tuple_add_from_str(lnast, parent_node, absl::StrCat(reg_raw_name, ".__initial"), initial_node, stmt);
   }
 }
@@ -2795,7 +2797,7 @@ void Inou_firrtl_module::list_statement_info(Lnast& lnast, const firrtl::FirrtlP
       Pass::warn("Warning: commented \"I(false)\" to enable RocketTile LG generation.");
 #endif
       Pass::warn("Unknown statement type: {}, at line {} in file {}", (int)stmt.statement_case(), line_pos, fname);
-      //I(false);
+      // I(false);
       return;
   }
   // TODO: Attach source info into node creation (line #, col #).

inou/firrtl/inou_firrtl.hpp

@@ -15,7 +15,7 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/container/node_hash_map.h"
 #include "firrtl.pb.h"
-#include "google/protobuf/util/time_util.h"
+// #include "google/protobuf/util/time_util.h"
 
 #pragma GCC diagnostic pop
 // LiveHD includes
@@ -25,7 +25,8 @@
 #include "lnast.hpp"
 #include "pass.hpp"
 
-using google::protobuf::util::TimeUtil;
+// using google::protobuf::util::TimeUtil;
+
 struct Global_module_info {
   absl::node_hash_map<std::string, absl::flat_hash_map<std::string, std::pair<uint16_t, bool>>>
                                                                      module2outputs;  // <hier_name, bits, sign>