From 8c911f70b9024d4f9b834db3d6e893d4ce085c50 Mon Sep 17 00:00:00 2001 From: mrg Date: Sun, 6 Mar 2022 10:31:43 -0800 Subject: [PATCH] Build changes. Don't pull docker since it will be build by CI. Shuffle tests to stagger technologies and test types. --- compiler/modules/wordline_buffer_array.py | 4 ++-- compiler/tests/Makefile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compiler/modules/wordline_buffer_array.py b/compiler/modules/wordline_buffer_array.py index b62ea872..51fe4030 100644 --- a/compiler/modules/wordline_buffer_array.py +++ b/compiler/modules/wordline_buffer_array.py @@ -43,7 +43,7 @@ class wordline_buffer_array(design.design): self.route_layer = "m1" self.place_drivers() self.route_layout() - self.route_vdd_gnd() + self.route_supplies() self.offset_all_coordinates() self.add_boundary() self.DRC_LVS() @@ -65,7 +65,7 @@ class wordline_buffer_array(design.design): size=self.cols, height=b.height) - def route_vdd_gnd(self): + def route_supplies(self): """ Add a pin for each row of vdd/gnd which are must-connects next level up. diff --git a/compiler/tests/Makefile b/compiler/tests/Makefile index 5ddcf862..c40698d9 100644 --- a/compiler/tests/Makefile +++ b/compiler/tests/Makefile @@ -86,17 +86,17 @@ getfile = $(word 2,$(subst /, ,$*)) TECH_TEST_STAMPS=$(foreach T, $(TEST_TECHS), $(addprefix $T/, $(TEST_STAMPS))) # Filter out the tests after creating the tech stamps -WORKING_TECH_TEST_STAMPS=$(filter-out $(BROKEN_STAMPS), $(TECH_TEST_STAMPS)) +WORKING_TECH_TEST_STAMPS=$(shell shuf -e -- $(filter-out $(BROKEN_STAMPS), $(TECH_TEST_STAMPS))) # Run all technologies -all: docker-pull $(WORKING_TECH_TEST_STAMPS) +all: $(WORKING_TECH_TEST_STAMPS) @ls -1 $(TOP_DIR)/compiler/tests/results/*/*.bad 1> /dev/null 2>&1 && echo "FAILING TESTS" && ls -1 $(TOP_DIR)/compiler/tests/results/*/*.bad | sed -e "s#^.*results\/##" && exit 1 || exit 0 .PHONY: all # Run a given technology # e.g. make freepdk45 -$(TECHS): docker-pull +$(TECHS): @$(MAKE) --no-print-directory $(filter-out $(BROKEN_STAMPS), $(addprefix $@/, $(TEST_STAMPS))) .PHONY: $(TECHS)