fix several compile library updates

Author: renau

.bazelversion

@@ -1 +1 @@
-7.2.1
+7.5.0

MODULE.bazel

@@ -3,26 +3,24 @@
 # 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 = "rules_foreign_cc", version = "0.11.1")
 
-#### M4/Flex/Bison
-bazel_dep(name = "rules_m4", version = "0.2.3")
+bazel_dep(name = "abseil-cpp", version = "20250127.0") # 20240722.0.bcr.2")
+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 = "27.1")
 
-bazel_dep(name = "rules_flex", version = "0.2.1")
+bazel_dep(name = "rules_m4", version = "0.2.4")
+bazel_dep(name = "rules_flex", version = "0.3.1")
+bazel_dep(name = "rules_bison", version = "0.3.1")
 
-bazel_dep(name = "rules_bison", version = "0.2.2")
+bazel_dep(name = "rapidjson", version = "1.1.0.bcr.20241007")
 
-# google benchmark
-bazel_dep(name = "google_benchmark", version = "1.8.5")
-
-# rapidjson
-bazel_dep(name = "rapidjson", version = "1.1.0")
-
-# 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.0")
+bazel_dep(name = "tree-sitter-bazel", version = "0.24.4", repo_name="tree-sitter")
 
-# 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",
@@ -73,15 +72,15 @@ http_archive(
 )
 
 # tree sitter
-http_archive(
-    name = "tree-sitter",
-    build_file = "tree-sitter.BUILD",
-    sha256 = "e9f2772b12d4b12a0db5542ce72e8c85a34e397f2c3fd7b3fa08814f71fd35b3",
-    strip_prefix = "tree-sitter-0.23.0",
-    urls = [
-        "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.zip",
-    ],
-)
+# http_archive(
+#     name = "tree-sitter",
+#     build_file = "tree-sitter.BUILD",
+#     sha256 = "e9f2772b12d4b12a0db5542ce72e8c85a34e397f2c3fd7b3fa08814f71fd35b3",
+#     strip_prefix = "tree-sitter-0.23.0",
+#     urls = [
+#         "https://github.com/tree-sitter/tree-sitter/archive/refs/tags/v0.23.0.zip",
+#     ],
+# )
 
 # nlohmann json
 http_archive(
@@ -107,10 +106,10 @@ http_archive(
 # HIF
 http_archive(
     name = "hif",
-    sha256 = "bf4d0d5e06b100b616c35b8fc1601de482ea0dfc7b8f0f75763f9b9020076626",
-    strip_prefix = "hif-11b5dc3eda963fe5220345dac7fa2ccc68545182",
+    sha256 = "b8103f11e679ae8e3dd700f0c41ed4191aa819c215256066a8ff0e531cb77a63",
+    strip_prefix = "hif-cf106676965e935aa2e46754e3e17a68a5367781",
     urls = [
-        "https://github.com/masc-ucsc/hif/archive/11b5dc3eda963fe5220345dac7fa2ccc68545182.zip",
+        "https://github.com/masc-ucsc/hif/archive/cf106676965e935aa2e46754e3e17a68a5367781.zip",
     ],
 )
 
@@ -197,24 +196,24 @@ 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()
+# 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()
 
-rules_proto_toolchains()
+# 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",

benchmark/BUILD

@@ -9,7 +9,6 @@ cc_binary(
     copts = COPTS,
     deps = [
         "//core",
-        "//inou/firrtl:inou_firrtl_cpp",
         "//lgraph",
         "//lnast",
         "//pass/lnast_tolg:pass_lnast_tolg",

benchmark/bm_format.cpp

@@ -8,17 +8,16 @@
 
 #include "benchmark/benchmark.h"
 
-#include "core/lhtree.hpp"
+#include "lhtree.hpp"
 #include "eprp_var.hpp"
 
-#include "lnast/lnast_writer.hpp"
-#include "lnast/lnast_parser.hpp"
-#include "lnast/lnast_hif_writer.hpp"
-#include "lnast/lnast_hif_reader.hpp"
+#include "lnast_writer.hpp"
+#include "lnast_parser.hpp"
+#include "lnast_hif_writer.hpp"
+#include "lnast_hif_reader.hpp"
 
-#include "lgraph/lgraph.hpp"
-#include "pass/lnast_tolg/lnast_tolg.hpp"
-#include "inou/firrtl/inou_firrtl.hpp"
+#include "lgraph.hpp"
+#include "lnast_tolg.hpp"
 
 class LnastTestFixture : public benchmark::Fixture {
 public:
@@ -85,15 +84,15 @@ BENCHMARK_F(LnastTestFixture, LN_LNAST)(benchmark::State& st) {
   }
 }
 
+
+/*
 BENCHMARK_F(LnastTestFixture, FIRRTL_LNAST)(benchmark::State& st) {
   for (auto _ : st) {  
     Eprp_var var;
     var.add("files", "benchmark/firrtl/test.pb");
     Inou_firrtl::to_lnast(var);
   }
 }
-
-/*
 BENCHMARK_F(LnastTestFixture, LNAST_FIRRTL)(benchmark::State& st) {
   Eprp_var var;
   var.add("files", "benchmark/firrtl/test.pb");

inou/firrtl/BUILD

@@ -1,5 +1,8 @@
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
+# load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
 load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_proto_library")
+load("@rules_proto_grpc_cpp//:defs.bzl", "cpp_proto_compile")
+
 load("//tools:copt_default.bzl", "COPTS")
 
 FIRRTL_TESTS = glob([
@@ -10,15 +13,10 @@ FIRRTL_TESTS = glob([
 proto_library(
     name = "firrtl_proto",
     srcs = ["firrtl.proto"],
-    deps = ["@com_google_protobuf//:any_proto"],
-)
-
-cc_proto_library(
-    name = "firrtl_cc_proto",
-    deps = [":firrtl_proto"],
+    deps = ["@protobuf//:any_proto"],
 )
 
-cc_library(
+cpp_proto_library(
     name = "inou_firrtl_cpp",
     srcs = [
         "find_circuit_comps.cpp",
@@ -27,15 +25,38 @@ cc_library(
         "inou_firrtl.hpp",
         "lnast_tofir.cpp",
     ],
-    hdrs = ["inou_firrtl.hpp"],
-    copts = COPTS,
     includes = ["."],
+    hdrs = ["inou_firrtl.hpp"],
+    protos = [":firrtl_proto"],
     visibility = ["//visibility:public"],
     deps = [
-        ":firrtl_cc_proto",
         "//pass/common:pass",
     ],
-    alwayslink = True,
 )
 
+# cc_proto_library(
+#     name = "firrtl_cc_proto",
+#     deps = [":firrtl_proto"],
+# )
+
+# cc_library(
+#     name = "inou_firrtl_cpp",
+#     srcs = [
+#         "find_circuit_comps.cpp",
+#         "fir_tolnast.cpp",
+#         "inou_firrtl.cpp",
+#         "inou_firrtl.hpp",
+#         "lnast_tofir.cpp",
+#     ],
+#     hdrs = ["inou_firrtl.hpp"],
+#     copts = COPTS,
+#     includes = ["."],
+#     visibility = ["//visibility:public"],
+#     deps = [
+#         ":firrtl_lib_proto",
+#         "//pass/common:pass",
+#     ],
+#     alwayslink = True,
+# )
+
 exports_files(FIRRTL_TESTS + ["post_io_renaming.py"])