|
7 | 7 |
|
8 | 8 | setlocal
|
9 | 9 | set ERRORLEVEL=
|
| 10 | + set BENCHVIEW_RUN_TYPE=local |
10 | 11 | set CORECLR_REPO=%CD%
|
11 | 12 | set TEST_FILE_EXT=exe
|
12 | 13 | set TEST_ARCH=x64
|
@@ -109,7 +110,7 @@ rem ****************************************************************************
|
109 | 110 | goto :parse_command_line_arguments
|
110 | 111 | )
|
111 | 112 | IF /I [%~1] == [-runtype] (
|
112 |
| - set RUN_TYPE=%~2 |
| 113 | + set BENCHVIEW_RUN_TYPE=%~2 |
113 | 114 | shift
|
114 | 115 | shift
|
115 | 116 | goto :parse_command_line_arguments
|
@@ -222,23 +223,25 @@ endlocal& exit /b %ERRORLEVEL%
|
222 | 223 | rem ****************************************************************************
|
223 | 224 | rem Generates BenchView's submission data and upload it
|
224 | 225 | rem ****************************************************************************
|
225 |
| - call :run_cmd py.exe "%BENCHVIEW_PATH%\submission.py" measurement.json ^ |
226 |
| - --build ..\build.json ^ |
227 |
| - --machine-data ..\machinedata.json ^ |
228 |
| - --metadata ..\submission-metadata.json ^ |
229 |
| - --group "CoreCLR" ^ |
230 |
| - --type "%RUN_TYPE%" ^ |
231 |
| - --config-name "%TEST_CONFIG%" ^ |
232 |
| - --config Configuration "%TEST_CONFIG%" ^ |
233 |
| - --config OS "Windows_NT" ^ |
234 |
| - --arch "%TEST_ARCHITECTURE%" ^ |
235 |
| - --machinepool "PerfSnake" |
| 226 | +setlocal |
| 227 | + set LV_SUBMISSION_ARGS= |
| 228 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --build ..\build.json |
| 229 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machine-data ..\machinedata.json |
| 230 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --metadata ..\submission-metadata.json |
| 231 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --group "CoreCLR" |
| 232 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --type "%BENCHVIEW_RUN_TYPE%" |
| 233 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config-name "%TEST_CONFIG%" |
| 234 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config Configuration "%TEST_CONFIG%" |
| 235 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --config OS "Windows_NT" |
| 236 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --arch "%TEST_ARCHITECTURE%" |
| 237 | + set LV_SUBMISSION_ARGS=%LV_SUBMISSION_ARGS% --machinepool "PerfSnake" |
| 238 | + call :run_cmd py.exe "%BENCHVIEW_PATH%\submission.py" measurement.json %LV_SUBMISSION_ARGS% |
236 | 239 | IF %ERRORLEVEL% NEQ 0 (
|
237 | 240 | call :print_error Creating BenchView submission data failed.
|
238 | 241 | exit /b 1
|
239 | 242 | )
|
240 | 243 |
|
241 |
| - REM FIXME: call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr |
| 244 | + call :run_cmd py.exe "%BENCHVIEW_PATH%\upload.py" submission.json --container coreclr |
242 | 245 | IF %ERRORLEVEL% NEQ 0 (
|
243 | 246 | call :print_error Uploading to BenchView failed.
|
244 | 247 | exit /b 1
|
|
0 commit comments