diff options
| author | José Rivero <jorive@microsoft.com> | 2017-06-01 08:56:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 08:56:27 -0700 |
| commit | 1d2e6f8b131af5c4f684c35418ee6c14b417b316 (patch) | |
| tree | 8b43165285f001b663dee24baf044904e9b3bf26 /perf.groovy | |
| parent | beaefc2188a4cf46c99e522f4ed0b57507b07633 (diff) | |
| download | coreclr-1d2e6f8b131af5c4f684c35418ee6c14b417b316.tar.gz coreclr-1d2e6f8b131af5c4f684c35418ee6c14b417b316.tar.bz2 coreclr-1d2e6f8b131af5c4f684c35418ee6c14b417b316.zip | |
Updating version of xUnit-Performance-Api (#11987)
- This update contains a fix for this issue: https://github.com/Microsoft/xunit-performance/issues/230
- Consolidate the Api version in two places: `dependencies.prop` and `PerfHarness.csproj`
- Move performance log files to root directory where Jenkins can archive them
- Fixed the output to console, so it is easier to see on the Jenkins job the sccript steps live and get an exact repro step if needed
Diffstat (limited to 'perf.groovy')
| -rw-r--r-- | perf.groovy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/perf.groovy b/perf.groovy index 125ed7b062..9be47c0b3c 100644 --- a/perf.groovy +++ b/perf.groovy @@ -105,12 +105,12 @@ def static getOSGroup(def os) { batchFile("tests\\runtest.cmd ${configuration} ${architecture} GenerateLayoutOnly") - // Run with just stopwatch + // Run with just stopwatch: Profile=Off batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\performance\\perflab\\Perflab -library -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} -runtype ${runType} -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH /AFFINITY 0x2\"") batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\Jit\\Performance\\CodeQuality -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} -runtype ${runType} -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH /AFFINITY 0x2\"") batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\performance\\linkbench\\linkbench -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} -nowarmup -runtype ${runType} -scenarioTest -group ILLink") - // Run with the full set of counters enabled + // Run with the full set of counters enabled: Profile=On batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\performance\\perflab\\Perflab -library -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} -runtype ${runType} -collectionFlags default+BranchMispredictions+CacheMisses+InstructionRetired+gcapi -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH /AFFINITY 0x2\"") batchFile("tests\\scripts\\run-xunit-perf.cmd -arch ${arch} -configuration ${configuration} -testBinLoc bin\\tests\\${os}.${architecture}.${configuration}\\Jit\\Performance\\CodeQuality -generateBenchviewData \"%WORKSPACE%\\Microsoft.Benchview.JSONFormat\\tools\" ${uploadString} -runtype ${runType} -collectionFlags default+BranchMispredictions+CacheMisses+InstructionRetired+gcapi -stabilityPrefix \"START \"CORECLR_PERF_RUN\" /B /WAIT /HIGH /AFFINITY 0x2\"") } @@ -124,6 +124,7 @@ def static getOSGroup(def os) { def archiveSettings = new ArchivalSettings() archiveSettings.addFiles('Perf-*.xml') archiveSettings.addFiles('Perf-*.etl') + archiveSettings.addFiles('Perf-*.log') archiveSettings.addFiles('machinedata.json') Utilities.addArchival(newJob, archiveSettings) @@ -288,6 +289,7 @@ def static getOSGroup(def os) { // Save machinedata.json to /artifact/bin/ Jenkins dir def archiveSettings = new ArchivalSettings() + archiveSettings.addFiles('Perf-*.log') archiveSettings.addFiles('Perf-*.xml') archiveSettings.addFiles('machinedata.json') Utilities.addArchival(newJob, archiveSettings) |