Fix Windows CMD quoting: pass license key/email as separate env vars

- customize.py no longer builds MLC_GEEKBENCH_UNLOCK_CMD string
- run.sh constructs unlock command from individual env vars
- Both scripts check MLC_GEEKBENCH_LICENSE_KEY directly

Author: amd-arsuresh

script/benchmark-program-geekbench/customize.py

@@ -17,16 +17,18 @@ def preprocess(i):
 
     q = '"' if os_info['platform'] == 'windows' else "'"
 
-    # License registration (geekbench6 --unlock <email> <key>)
+    # License registration
     license_key = env.get('MLC_GEEKBENCH_LICENSE_KEY', '').strip()
     license_email = env.get('MLC_GEEKBENCH_LICENSE_EMAIL', '').strip()
     if license_key:
         if not license_email:
             return {'return': 1,
                     'error': 'MLC_GEEKBENCH_LICENSE_EMAIL is required when MLC_GEEKBENCH_LICENSE_KEY is provided'}
-        unlock_cmd = f"{q}{geekbench_bin}{q} --unlock {license_email} {license_key}"
-        env['MLC_GEEKBENCH_UNLOCK_CMD'] = unlock_cmd
-        logger.info(f"Geekbench unlock command prepared: {unlock_cmd}")
+        # Pass parts separately so shell scripts can construct the command
+        # without quoting issues
+        env['MLC_GEEKBENCH_LICENSE_KEY'] = license_key
+        env['MLC_GEEKBENCH_LICENSE_EMAIL'] = license_email
+        logger.info("Geekbench license key provided, will register before benchmark")
 
     # Build the run command
     args = []

script/benchmark-program-geekbench/run.bat

@@ -10,13 +10,13 @@ if "%MLC_RUN_DIR%" == "" (
 
 cd /d "%MLC_RUN_DIR%"
 
-rem Register license if provided
-if not "%MLC_GEEKBENCH_UNLOCK_CMD%" == "" (
+rem Register license if key is provided
+if not "!MLC_GEEKBENCH_LICENSE_KEY!" == "" (
   echo.
   echo Registering Geekbench license...
-  %MLC_GEEKBENCH_UNLOCK_CMD%
+  "!MLC_GEEKBENCH_BIN_WITH_PATH!" --unlock !MLC_GEEKBENCH_LICENSE_EMAIL! !MLC_GEEKBENCH_LICENSE_KEY!
   if !ERRORLEVEL! NEQ 0 (
-    echo WARNING: Geekbench license registration failed ^(continuing anyway^)
+    echo WARNING: Geekbench license registration failed, continuing anyway
   ) else (
     echo Geekbench license registered successfully.
   )
@@ -25,28 +25,28 @@ if not "%MLC_GEEKBENCH_UNLOCK_CMD%" == "" (
 echo.
 echo ***********************************************************************
 echo Running Geekbench benchmark...
-echo Command: %MLC_RUN_CMD%
+echo Command: !MLC_RUN_CMD!
 echo ***********************************************************************
 echo.
 
-%MLC_RUN_CMD%
-set exitstatus=%ERRORLEVEL%
+!MLC_RUN_CMD!
+set exitstatus=!ERRORLEVEL!
 
-if %exitstatus% NEQ 0 (
+if !exitstatus! NEQ 0 (
   echo.
-  echo Geekbench exited with status: %exitstatus%
-  exit /b %exitstatus%
+  echo Geekbench exited with status: !exitstatus!
+  exit /b !exitstatus!
 )
 
 rem Check if results file was created
-if exist "%MLC_GEEKBENCH_RESULTS_FILE%" (
+if exist "!MLC_GEEKBENCH_RESULTS_FILE!" (
   echo.
-  echo Geekbench results saved to: %MLC_GEEKBENCH_RESULTS_FILE%
+  echo Geekbench results saved to: !MLC_GEEKBENCH_RESULTS_FILE!
   echo.
   echo Results summary:
-  type "%MLC_GEEKBENCH_RESULTS_FILE%"
+  type "!MLC_GEEKBENCH_RESULTS_FILE!"
   echo.
 ) else (
   echo.
-  echo WARNING: Geekbench results file not found at %MLC_GEEKBENCH_RESULTS_FILE%
+  echo WARNING: Geekbench results file not found at !MLC_GEEKBENCH_RESULTS_FILE!
 )

script/benchmark-program-geekbench/run.sh

@@ -2,20 +2,23 @@
 
 # Benchmark Program - Geekbench (Unix)
 
+CUR_DIR=$PWD
+
 if [ -z "${MLC_RUN_DIR}" ]; then
   echo "MLC_RUN_DIR is not set"
   exit 1
 fi
 
-cd "${MLC_RUN_DIR}"
+cd "${MLC_RUN_DIR}" || exit 1
 
-# Register license if provided
-if [ -n "${MLC_GEEKBENCH_UNLOCK_CMD}" ]; then
+# Register license if key is provided
+if [ -n "${MLC_GEEKBENCH_LICENSE_KEY}" ]; then
   echo ""
   echo "Registering Geekbench license..."
-  eval ${MLC_GEEKBENCH_UNLOCK_CMD}
-  if [ $? -ne 0 ]; then
-    echo "WARNING: Geekbench license registration failed (continuing anyway)"
+  "${MLC_GEEKBENCH_BIN_WITH_PATH}" --unlock "${MLC_GEEKBENCH_LICENSE_EMAIL}" "${MLC_GEEKBENCH_LICENSE_KEY}"
+  unlock_status=$?
+  if [ ${unlock_status} -ne 0 ]; then
+    echo "WARNING: Geekbench license registration failed (exit code: ${unlock_status}), continuing anyway"
   else
     echo "Geekbench license registered successfully."
   fi