From 4477cbeed135d07dc5077a73a14d433526abff7a Mon Sep 17 00:00:00 2001 From: Blaise Tine Date: Tue, 30 Nov 2021 15:36:59 -0500 Subject: [PATCH] blackbox caching fix --- ci/blackbox.sh | 8 +++++--- hw/rtl/VX_config.vh | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ci/blackbox.sh b/ci/blackbox.sh index f2c6ec2b..88930faf 100755 --- a/ci/blackbox.sh +++ b/ci/blackbox.sh @@ -124,9 +124,11 @@ CONFIGS="-DNUM_CLUSTERS=$CLUSTERS -DNUM_CORES=$CORES -DNUM_WARPS=$WARPS -DNUM_TH echo "CONFIGS=$CONFIGS" -if [ -f "blackbox.cache" ] +BLACKBOX_CACHE=blackbox.$DRIVER.cache + +if [ -f "$BLACKBOX_CACHE" ] then - LAST_CONFIGS=`cat blackbox.cache` + LAST_CONFIGS=`cat $BLACKBOX_CACHE` fi if [ "$CONFIGS+$DEBUG+$SCOPE" != "$LAST_CONFIGS" ]; @@ -134,7 +136,7 @@ then make -C $DRIVER_PATH clean fi -echo "$CONFIGS+$DEBUG+$SCOPE" > blackbox.cache +echo "$CONFIGS+$DEBUG+$SCOPE" > $BLACKBOX_CACHE status=0 diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh index 8e0bbaa8..e9e57b03 100644 --- a/hw/rtl/VX_config.vh +++ b/hw/rtl/VX_config.vh @@ -269,7 +269,7 @@ `define CSR_TEX_WRAPU (`CSR_TEX_STATE_BEGIN+`TEX_STATE_WRAPU) `define CSR_TEX_WRAPV (`CSR_TEX_STATE_BEGIN+`TEX_STATE_WRAPV) `define CSR_TEX_MIPOFF(lod) (`CSR_TEX_STATE_BEGIN+`TEX_STATE_MIPOFF(lod)) -`define CSR_TEX_STATE_END (`CSR_TEX_STATE_BEGIN + `NUM_TEX_STATES) +`define CSR_TEX_STATE_END (`CSR_TEX_STATE_BEGIN+`NUM_TEX_STATES) `define CSR_TEX_STATE(addr) ((addr) - `CSR_TEX_STATE_BEGIN)