diff --git a/BUILD.bazel b/BUILD.bazel
index d172965..24ac7ed 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -387,6 +387,16 @@ SWEEP = {
         "macros": ["ComposedBranchPredictorBank_generate_abstract"],
         "stage_sources": {"floorplan": ["pdn.tcl"]},
     },
+    "2": {
+        "description": "Hierarchical, branch predictors as macros",
+        "variables": {
+            "HOLD_SLACK_MARGIN": "-900",
+            "PDN_TCL": "$(location :pdn.tcl)",
+            "MAX_ROUTING_LAYER": "M9",
+        },
+        "macros": ["BranchPredictor_generate_abstract"],
+        "stage_sources": {"floorplan": ["pdn.tcl"]},
+    },
 }
 
 BOOMTILE_VARIABLES = SKIP_REPORT_METRICS | FAST_BUILD_SETTINGS | {
@@ -456,8 +466,8 @@ BRANCH_PREDICTOR_VARIABLES = SKIP_REPORT_METRICS | FAST_BUILD_SETTINGS | {
     "HOLD_SLACK_MARGIN": "-200",
 }
 
-orfs_flow(
-    name = "ComposedBranchPredictorBank",
+[orfs_flow(
+    name = module,
     abstract_stage = "cts",
     arguments = BRANCH_PREDICTOR_VARIABLES,
     macros = [
@@ -466,7 +476,10 @@ orfs_flow(
     ],
     stage_sources = BOOMTILE_SOURCES,
     verilog_files = all_source_files,
-)
+) for module in [
+    "ComposedBranchPredictorBank",
+    "BranchPredictor",
+]]
 
 [orfs_flow(
     name = "BoomTile",