Fix local bootstrap and DISC CPU compatibility

Author: An Zhong

python/assassyn/codegen/verilog/top.py

@@ -546,7 +546,7 @@ def _attach_external_values(module, port_map, handled_ports):
 
             dumper.append_code(
                 f"{mod_name}_trigger_counter_delta.assign("
-                f"{summed_triggers}.as_bits()[0:{width}])"
+                f"{summed_triggers}.as_bits().pad_or_truncate({width}))"
                 )
         else:
             dumper.append_code(

scripts/init/circt.inc

@@ -4,19 +4,15 @@
 .PHONY: install-circt clean-circt patch-circt build-pycde-source verify-pycde-installation check-wheel-exists install-pycde-wheel
 
 # Patch target for circt
-patch-circt: 3rd-party/circt/.patch-applied
-
-# Marker file to track patch application
-3rd-party/circt/.patch-applied:
+patch-circt:
 	@echo "Checking circt patch status..."
 	@cd 3rd-party/circt && \
 		if bash ../../scripts/patch-apply.sh check ../../scripts/init/patches/circt.patch 2>/dev/null; then \
 			echo "CIRCT patch already applied — skipping patch step."; \
 		else \
 			echo "Applying CIRCT patch..."; \
 			bash ../../scripts/patch-apply.sh apply ../../scripts/init/patches/circt.patch; \
-		fi && \
-		touch $(CURDIR)/3rd-party/circt/.patch-applied
+		fi
 
 install-circt: install-py-package 3rd-party/circt/.circt-built
 
@@ -40,6 +36,10 @@ verify-pycde-installation:
 # Check if wheel exists
 check-wheel-exists:
 	@if [ ! -d "3rd-party/circt/frontends/PyCDE/dist" ] || [ -z "$$(ls 3rd-party/circt/frontends/PyCDE/dist/*.whl 2>/dev/null)" ]; then \
+		if [ ! -f "3rd-party/circt/llvm/llvm/CMakeLists.txt" ]; then \
+			echo "Missing 3rd-party/circt/llvm checkout. Run 'git submodule update --init --recursive' and retry." >&2; \
+			exit 1; \
+		fi; \
 		echo "No wheel found, building PyCDE from source..."; \
 		$(MAKE) build-pycde-source; \
 	fi

scripts/init/patches/circt.patch

@@ -1,3 +1,7 @@
 frontends/PyCDE/setup.py
 -      cmake_args += ["-DESI_RUNTIME=ON"]
-+      cmake_args += ["-DESI_RUNTIME=OFF"]
++      # Assassyn disables ESI runtime for local PyCDE builds.
++      cmake_args += ["-DESI_RUNTIME=OFF"]
+-    targets = ["check-pycde"]
++    # Assassyn skips upstream PyCDE self-tests during local bootstrap.
++    targets = ["install-PyCDE"]

scripts/init/py-package.inc

@@ -1,20 +1,26 @@
 # Python package installation targets
 # Converted from scripts/init/py-package.sh
 
+PYTHON_VENV_BIN ?= $(shell command -v python3.12 2>/dev/null || command -v python3 2>/dev/null || command -v python 2>/dev/null)
+
 .PHONY: install-py-package clean-python
 
 install-py-package:
 	@echo "Setting up Python virtual environment..."
+	@if [ -z "$(PYTHON_VENV_BIN)" ]; then \
+		echo "No suitable Python interpreter found. Tried python3.12, python3, and python." >&2; \
+		exit 1; \
+	fi
 	@if [ ! -d "$(VENV_DIR)" ]; then \
-		echo "Creating virtual environment..."; \
-		python -m venv $(VENV_DIR); \
+		echo "Creating virtual environment with $(PYTHON_VENV_BIN)..."; \
+		"$(PYTHON_VENV_BIN)" -m venv $(VENV_DIR); \
 	else \
 		echo "Virtual environment already exists."; \
 	fi
 	@echo "Installing dependencies using virtual environment Python..."
-	@. $(VENV_DIR)/bin/activate && pip install --upgrade pip
-	@. $(VENV_DIR)/bin/activate && pip install build 
-	@. $(VENV_DIR)/bin/activate && pip install -r python/requirements.txt
+	@$(VENV_DIR)/bin/python -m pip install --upgrade pip
+	@$(VENV_DIR)/bin/python -m pip install build
+	@$(VENV_DIR)/bin/python -m pip install -r python/requirements.txt
 	@echo "Python dependencies installed successfully in virtual environment."
 
 clean-python:

scripts/init/wrapper.inc

@@ -4,51 +4,51 @@
 .PHONY: build-ramulator2 build-wrapper clean-ramulator2 clean-wrapper patch-ramulator2
 
 # Patch target for ramulator2
-patch-ramulator2: 3rd-party/ramulator2/.patch-applied
-
-# Marker file to track patch application
-3rd-party/ramulator2/.patch-applied:
+patch-ramulator2:
 	@echo "Checking ramulator2 patch status..."
 	@cd 3rd-party/ramulator2 && \
 		if bash ../../scripts/patch-apply.sh check ../../scripts/init/patches/ramulator2.patch 2>/dev/null; then \
 			echo "Ramulator2 patch already applied — skipping patch step."; \
 		else \
 			echo "Applying ramulator2 patch..."; \
 			bash ../../scripts/patch-apply.sh apply ../../scripts/init/patches/ramulator2.patch; \
-		fi && \
-		touch $(CURDIR)/3rd-party/ramulator2/.patch-applied
+		fi
 
-build-ramulator2: 3rd-party/ramulator2/.ramulator2-built
+build-ramulator2: patch-ramulator2 3rd-party/ramulator2/.ramulator2-built
 
 # Marker file to track build completion
-3rd-party/ramulator2/.ramulator2-built: patch-ramulator2
-	@if [ -f "$@" ]; then \
+3rd-party/ramulator2/.ramulator2-built:
+	@if [ -f "$@" ] && ls 3rd-party/ramulator2/libramulator.* >/dev/null 2>&1; then \
 		echo "Ramulator2 already built — skipping build step."; \
 	else \
-		echo "Building Ramulator2..."; \
-		echo "Step 1: Creating build directory..."; \
-		mkdir -p 3rd-party/ramulator2/build; \
-		echo "Step 2: Running CMake configuration..."; \
-		cmake -B 3rd-party/ramulator2/build -S 3rd-party/ramulator2 -DCMAKE_POLICY_VERSION_MINIMUM=3.5; \
-		echo "Step 3: Building with make..."; \
-		make -C 3rd-party/ramulator2/build -j; \
-		echo "Ramulator2 build completed."; \
+		rm -f $(CURDIR)/$@; \
+		echo "Building Ramulator2..." && \
+		echo "Step 1: Creating build directory..." && \
+		mkdir -p 3rd-party/ramulator2/build && \
+		echo "Step 2: Running CMake configuration..." && \
+		cmake -B 3rd-party/ramulator2/build -S 3rd-party/ramulator2 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 && \
+		echo "Step 3: Building with make..." && \
+		$(MAKE) -C 3rd-party/ramulator2/build -j && \
+		ls 3rd-party/ramulator2/libramulator.* >/dev/null 2>&1 && \
+		echo "Ramulator2 build completed." && \
 		touch $(CURDIR)/$@; \
 	fi
 
 build-wrapper: tools/c-ramulator2-wrapper/.wrapper-built
 
 # Marker file to track wrapper build completion
 tools/c-ramulator2-wrapper/.wrapper-built: build-ramulator2
-	@if [ -f "$@" ]; then \
+	@if [ -f "$@" ] && ls tools/c-ramulator2-wrapper/build/lib/libwrapper.* >/dev/null 2>&1; then \
 		echo "Wrapper already built — skipping build step."; \
 	else \
-		echo "Building Wrapper..."; \
+		rm -f $(CURDIR)/$@; \
+		echo "Building Wrapper..." && \
 		mkdir -p tools/c-ramulator2-wrapper/build && \
 			cd tools/c-ramulator2-wrapper/build && \
 			cmake .. && \
-			make -j; \
-		echo "Wrapper build completed."; \
+			$(MAKE) -j && \
+			ls lib/libwrapper.* >/dev/null 2>&1 && \
+		echo "Wrapper build completed." && \
 		touch $(CURDIR)/$@; \
 	fi