From 28406c4e541bece32439d65cd1ba5a3e4af5aae8 Mon Sep 17 00:00:00 2001
From: Andrea Belano <andrea.belano@studio.unibo.it>
Date: Tue, 28 Jan 2025 15:44:23 +0100
Subject: [PATCH] Correctly set QUESTA variable for pulp cluster

---
 rules/pulpos/targets/astral-cluster.mk   |  2 +-
 rules/pulpos/targets/carfield-cluster.mk |  2 +-
 rules/pulpos/targets/pulp_cluster.mk     | 18 ++++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/rules/pulpos/targets/astral-cluster.mk b/rules/pulpos/targets/astral-cluster.mk
index b88d627..9de2b44 100644
--- a/rules/pulpos/targets/astral-cluster.mk
+++ b/rules/pulpos/targets/astral-cluster.mk
@@ -1,6 +1,6 @@
 HOSTNAME := $(shell hostname)
 ETH_HOST = $(shell echo $(HOSTNAME) | grep -q "\.ee\.ethz\.ch$$" && echo 1 || echo 0)
-ifeq (ETH_HOST,1)
+ifeq ($(ETH_HOST),1)
 QUESTA ?= questa-2022.3
 else
 QUESTA ?= 
diff --git a/rules/pulpos/targets/carfield-cluster.mk b/rules/pulpos/targets/carfield-cluster.mk
index 4df559b..8e52c56 100644
--- a/rules/pulpos/targets/carfield-cluster.mk
+++ b/rules/pulpos/targets/carfield-cluster.mk
@@ -1,6 +1,6 @@
 HOSTNAME := $(shell hostname)
 ETH_HOST = $(shell echo $(HOSTNAME) | grep -q "\.ee\.ethz\.ch$$" && echo 1 || echo 0)
-ifeq (ETH_HOST,1)
+ifeq ($(ETH_HOST),1)
 QUESTA ?= questa-2022.3
 else
 QUESTA ?= 
diff --git a/rules/pulpos/targets/pulp_cluster.mk b/rules/pulpos/targets/pulp_cluster.mk
index 2c34d1e..6f0af47 100644
--- a/rules/pulpos/targets/pulp_cluster.mk
+++ b/rules/pulpos/targets/pulp_cluster.mk
@@ -66,15 +66,17 @@ endif
 
 include $(PULPRT_HOME)/rules/pulpos/default_rules.mk
 
+HOSTNAME := $(shell hostname)
+ETH_HOST = $(shell echo $(HOSTNAME) | grep -q "\.ee\.ethz\.ch$$" && echo 1 || echo 0)
+ifeq ($(ETH_HOST),1)
+QUESTA ?= questa-2023.4-zr
+else
+QUESTA ?= 
+endif
+
 ifndef gui
 vsim-flags = -c
 endif
 
-VSIM ?= vsim
-
-run:
-ifdef gui
-	$(VSIM) $(vsim-flags) -do "set  VSIM_PATH $(VSIM_PATH); set  APP $(TARGET_BUILD_DIR)/$(PULP_APP)/$(PULP_APP); source $(VSIM_PATH)/scripts/start.tcl"
-else
-	$(VSIM) $(vsim-flags) -do "set  VSIM_PATH $(VSIM_PATH); set  APP $(TARGET_BUILD_DIR)/$(PULP_APP)/$(PULP_APP); source $(VSIM_PATH)/scripts/run_and_exit.tcl"
-endif
+run: $(TARGETS)
+	cd $(TARGET_BUILD_DIR); $(QUESTA) vsim $(vsim-flags) -do "set  VSIM_PATH $(VSIM_PATH); source $(VSIM_PATH)/scripts/start.tcl"