Switch build to bazel

dsharlet · Jan 18, 2024 · 88880a6 · 88880a6
1 parent ec15819
commit 88880a6
Show file tree

Hide file tree

Showing 45 changed files with 303 additions and 347 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -0,0 +1,2 @@
+common --enable_bzlmod
+build --action_env=BAZEL_CXXOPTS="-std=c++20:-fstrict-aliasing:-Wall"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           gcc: '11'
 
       - name: Build and test
-        run: make test -j8
+        run: bazel test -c opt ...
 
       - name: Build and run performance app
-        run: make bin/performance && bin/performance
+        run: bazel run -c opt apps/performance
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 # Output directories
-bin/*
-obj/*
-docs/*
+bazel-*
+
+*.lock
 
 # Compiled Object files
 *.slo
@@ -18,9 +18,6 @@ docs/*
 *.dylib
 *.dll
 
-# Fortran module files
-*.mod
-
 # Compiled Static libraries
 *.lai
 *.la

diff --git a/BUILD b/BUILD
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -0,0 +1 @@
+bazel_dep(name = "googletest", version = "1.14.0")
diff --git a/Makefile b/Makefile
diff --git a/apps/BUILD b/apps/BUILD
@@ -0,0 +1,10 @@
+cc_binary(
+    name = "memcpy",
+    srcs = ["memcpy.cc", "benchmark.h"],
+)
+
+cc_binary(
+    name = "performance",
+    srcs = ["performance.cc", "benchmark.h"],
+    deps = ["//src:slinky"],
+)
diff --git a/apps/memcpy.cc b/apps/memcpy.cc
@@ -1,4 +1,4 @@
-#include "benchmark.h"
+#include "apps/benchmark.h"
 
 #include <cassert>
 #include <chrono>

diff --git a/apps/performance.cc b/apps/performance.cc
@@ -1,5 +1,5 @@
-#include "benchmark.h"
-#include "pipeline.h"
+#include "apps/benchmark.h"
+#include "src/pipeline.h"
 
 #include <cassert>
 #include <cstdlib>

diff --git a/src/BUILD b/src/BUILD
@@ -0,0 +1,43 @@
+
+cc_library(
+    name = "runtime",
+    srcs = [
+        "buffer.cc",
+    ],
+    hdrs = [
+        "arithmetic.h", 
+        "buffer.h",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+cc_library(
+    name = "slinky",
+    srcs = [
+        "evaluate.cc",
+        "expr.cc",
+        "infer_bounds.cc",
+        "node_mutator.cc",
+        "optimizations.cc",
+        "pipeline.cc",
+        "print.cc",
+        "simplify.cc",
+        "substitute.cc",
+    ],
+    hdrs = [
+        "arithmetic.h",
+        "evaluate.h",
+        "expr.h",
+        "infer_bounds.h",
+        "node_mutator.h",
+        "optimizations.h",
+        "pipeline.h",
+        "print.h",
+        "ref_count.h",
+        "simplify.h",
+        "substitute.h",
+        "symbol_map.h",
+    ],
+    deps = [":runtime"],
+    visibility = ["//visibility:public"],
+)
diff --git a/src/arithmetic.h b/src/arithmetic.h
@@ -2,6 +2,7 @@
 #define SLINKY_EUCLIDEAN_DIVISION_H
 
 #include <cmath>
+#include <limits>
 
 namespace slinky {
 

diff --git a/src/buffer.cc b/src/buffer.cc
@@ -1,4 +1,4 @@
-#include "buffer.h"
+#include "src/buffer.h"
 
 #include <cstdint>
 

diff --git a/src/buffer.h b/src/buffer.h
@@ -9,8 +9,7 @@
 #include <memory>
 #include <span>
 
-#include "arithmetic.h"
-#include "ref_count.h"
+#include "src/arithmetic.h"
 
 namespace slinky {
 

diff --git a/src/evaluate.cc b/src/evaluate.cc
@@ -1,11 +1,11 @@
-#include "evaluate.h"
+#include "src/evaluate.h"
 
 #include <cassert>
 #include <iostream>
 
-#include "print.h"
-#include "simplify.h"
-#include "substitute.h"
+#include "src/print.h"
+#include "src/simplify.h"
+#include "src/substitute.h"
 
 namespace slinky {
 

diff --git a/src/evaluate.h b/src/evaluate.h
@@ -1,8 +1,8 @@
 #ifndef SLINKY_EVALUATE_H
 #define SLINKY_EVALUATE_H
 
-#include "expr.h"
-#include "symbol_map.h"
+#include "src/expr.h"
+#include "src/symbol_map.h"
 
 namespace slinky {
 

diff --git a/src/expr.cc b/src/expr.cc
@@ -1,6 +1,6 @@
-#include "expr.h"
+#include "src/expr.h"
 
-#include "simplify.h"
+#include "src/simplify.h"
 
 #include <limits>
 

diff --git a/src/expr.h b/src/expr.h
@@ -1,8 +1,8 @@
 #ifndef SLINKY_EXPR_H
 #define SLINKY_EXPR_H
 
-#include "buffer.h"
-#include "ref_count.h"
+#include "src/buffer.h"
+#include "src/ref_count.h"
 
 #include <cstdlib>
 #include <functional>

diff --git a/src/infer_bounds.cc b/src/infer_bounds.cc
@@ -1,13 +1,13 @@
-#include "infer_bounds.h"
+#include "src/infer_bounds.h"
 
 #include <cassert>
 #include <iostream>
 
-#include "node_mutator.h"
-#include "optimizations.h"
-#include "print.h"
-#include "simplify.h"
-#include "substitute.h"
+#include "src/node_mutator.h"
+#include "src/optimizations.h"
+#include "src/print.h"
+#include "src/simplify.h"
+#include "src/substitute.h"
 
 namespace slinky {
 

diff --git a/src/infer_bounds.h b/src/infer_bounds.h
@@ -1,7 +1,7 @@
 #ifndef SLINKY_INFER_BOUNDS_H
 #define SLINKY_INFER_BOUNDS_H
 
-#include "symbol_map.h"
+#include "src/symbol_map.h"
 
 namespace slinky {
 

diff --git a/src/node_mutator.cc b/src/node_mutator.cc
@@ -1,4 +1,4 @@
-#include "node_mutator.h"
+#include "src/node_mutator.h"
 
 namespace slinky {
 

diff --git a/src/node_mutator.h b/src/node_mutator.h
@@ -1,7 +1,7 @@
 #ifndef SLINKY_NODE_MUTATOR_H
 #define SLINKY_NODE_MUTATOR_H
 
-#include "expr.h"
+#include "src/expr.h"
 
 namespace slinky {
 

diff --git a/src/optimizations.cc b/src/optimizations.cc
@@ -1,14 +1,14 @@
-#include "optimizations.h"
+#include "src/optimizations.h"
 
 #include <cassert>
 #include <map>
 #include <set>
 
-#include "evaluate.h"
-#include "node_mutator.h"
-#include "print.h"
-#include "simplify.h"
-#include "substitute.h"
+#include "src/evaluate.h"
+#include "src/node_mutator.h"
+#include "src/print.h"
+#include "src/simplify.h"
+#include "src/substitute.h"
 
 namespace slinky {
 

diff --git a/src/optimizations.h b/src/optimizations.h
@@ -1,7 +1,7 @@
 #ifndef SLINKY_OPTIMIZATIONS_H
 #define SLINKY_OPTIMIZATIONS_H
 
-#include "expr.h"
+#include "src/expr.h"
 
 namespace slinky {
 

diff --git a/src/pipeline.cc b/src/pipeline.cc
@@ -1,18 +1,18 @@
-#include "pipeline.h"
+#include "src/pipeline.h"
 
 #include <cassert>
 #include <iostream>
 #include <list>
 #include <map>
 #include <set>
 
-#include "evaluate.h"
-#include "infer_bounds.h"
-#include "node_mutator.h"
-#include "optimizations.h"
-#include "print.h"
-#include "simplify.h"
-#include "substitute.h"
+#include "src/evaluate.h"
+#include "src/infer_bounds.h"
+#include "src/node_mutator.h"
+#include "src/optimizations.h"
+#include "src/print.h"
+#include "src/simplify.h"
+#include "src/substitute.h"
 
 namespace slinky {
 

diff --git a/src/pipeline.h b/src/pipeline.h
@@ -1,9 +1,9 @@
 #ifndef SLINKY_PIPELINE_H
 #define SLINKY_PIPELINE_H
 
-#include "evaluate.h"
-#include "expr.h"
-#include "ref_count.h"
+#include "src/evaluate.h"
+#include "src/expr.h"
+#include "src/ref_count.h"
 
 namespace slinky {
 

diff --git a/src/print.cc b/src/print.cc
@@ -1,4 +1,4 @@
-#include "print.h"
+#include "src/print.h"
 
 #include <cassert>
 #include <iostream>

diff --git a/src/print.h b/src/print.h
@@ -1,7 +1,7 @@
 #ifndef SLINKY_PRINT_H
 #define SLINKY_PRINT_H
 
-#include "expr.h"
+#include "src/expr.h"
 
 #include <tuple>
 

diff --git a/src/simplify.cc b/src/simplify.cc
@@ -1,13 +1,13 @@
-#include "simplify.h"
+#include "src/simplify.h"
 
 #include <cassert>
 #include <iostream>
 #include <limits>
 
-#include "evaluate.h"
-#include "node_mutator.h"
-#include "print.h"
-#include "substitute.h"
+#include "src/evaluate.h"
+#include "src/node_mutator.h"
+#include "src/print.h"
+#include "src/substitute.h"
 
 namespace slinky {
 

diff --git a/src/simplify.h b/src/simplify.h
@@ -1,8 +1,8 @@
 #ifndef SLINKY_SIMPLIFY_H
 #define SLINKY_SIMPLIFY_H
 
-#include "expr.h"
-#include "symbol_map.h"
+#include "src/expr.h"
+#include "src/symbol_map.h"
 
 namespace slinky {
 

diff --git a/src/substitute.cc b/src/substitute.cc
@@ -1,9 +1,9 @@
-#include "substitute.h"
+#include "src/substitute.h"
 
 #include <cassert>
 
-#include "node_mutator.h"
-#include "symbol_map.h"
+#include "src/node_mutator.h"
+#include "src/symbol_map.h"
 
 namespace slinky {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		common --enable_bzlmod
		build --action_env=BAZEL_CXXOPTS="-std=c++20:-fstrict-aliasing:-Wall"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		bazel_dep(name = "googletest", version = "1.14.0")