Fix redundant NPU validation reruns

Author: Zhendong404

test/npu_validation/scripts/run_remote_npu_validation.sh

@@ -278,9 +278,9 @@ while IFS= read -r -d '' cpp; do
         fi
         python3 ./golden.py
         LD_LIBRARY_PATH="${LD_LIBRARY_PATH_NPU}" ./build/${testcase}
-        copy_outputs_as_golden
-        python3 ./golden.py
-        LD_LIBRARY_PATH="${LD_LIBRARY_PATH_NPU}" ./build/${testcase}
+        if [[ "${CUSTOM_GOLDEN}" == "1" ]]; then
+          log "Using custom golden for ${testcase}"
+        fi
         COMPARE_STRICT=1 python3 ./compare.py
         ;;
       skip)

test/npu_validation/templates/run_sh_template.sh

@@ -9,7 +9,6 @@ BUILD_DIR="${BUILD_DIR:-build}"
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 cd "${ROOT_DIR}"
-python3 "${ROOT_DIR}/golden.py"
 
 # Best-effort resolve PTO_ISA_ROOT for generated CMakeLists.txt.
 if [[ -z "${PTO_ISA_ROOT:-}" ]]; then
@@ -104,6 +103,7 @@ copy_outputs_as_golden() {
 
 case "${GOLDEN_MODE}" in
   sim)
+    python3 "${ROOT_DIR}/golden.py"
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH_SIM}" "${ROOT_DIR}/${BUILD_DIR}/@EXECUTABLE@_sim"
     copy_outputs_as_golden
     if [[ "${RUN_MODE}" == "npu" ]]; then
@@ -118,9 +118,6 @@ case "${GOLDEN_MODE}" in
     fi
     python3 "${ROOT_DIR}/golden.py"
     LD_LIBRARY_PATH="${LD_LIBRARY_PATH_NPU}" "${ROOT_DIR}/${BUILD_DIR}/@EXECUTABLE@"
-    copy_outputs_as_golden
-    python3 "${ROOT_DIR}/golden.py"
-    LD_LIBRARY_PATH="${LD_LIBRARY_PATH_NPU}" "${ROOT_DIR}/${BUILD_DIR}/@EXECUTABLE@"
     COMPARE_STRICT=1 python3 "${ROOT_DIR}/compare.py"
     ;;
   skip)