Hash :
d6fd7eaf
Author :
Date :
2023-08-25T16:33:27
Trace/perf tests: remove calibration and most warmup options This removes calibration and warmup except for --warmup (which does what --warmup-steps=-1 used to do: render each frame once with glFinish) Trace and perf tests now default to no warmup. Unchanged by this CL: --fixed-test-time=x runs a single trial for x seconds. --fixed-test-time-with-warmup=x is effectively the above flag coupled with --warmup-steps=-1 --run-to-key-frame runs to the key frame (no longer disables warmup as it's now off by default) Bug: b/297418214 Change-Id: I7a0d3e490067dbde57c5f519c1b9092ba70b1480 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4812049 Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Roman Lavrov <romanl@google.com> Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181
//
// Copyright 2019 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// ANGLEPerfTestArgs.cpp:
// Parse command line arguments for angle_perftests.
//
#include "ANGLEPerfTestArgs.h"
#include <string.h>
#include <sstream>
#include "common/debug.h"
#include "util/test_utils.h"
namespace angle
{
constexpr int kDefaultStepsPerTrial = std::numeric_limits<int>::max();
constexpr int kDefaultTrialTimeSeconds = 0;
constexpr int kDefaultTestTrials = 3;
int gStepsPerTrial = kDefaultStepsPerTrial;
int gMaxStepsPerformed = kDefaultMaxStepsPerformed;
bool gEnableTrace = false;
const char *gTraceFile = "ANGLETrace.json";
const char *gScreenshotDir = nullptr;
const char *gRenderTestOutputDir = nullptr;
bool gSaveScreenshots = false;
int gScreenshotFrame = kDefaultScreenshotFrame;
bool gVerboseLogging = false;
bool gWarmup = false;
int gTrialTimeSeconds = kDefaultTrialTimeSeconds;
int gTestTrials = kDefaultTestTrials;
bool gNoFinish = false;
bool gRetraceMode = false;
bool gMinimizeGPUWork = false;
bool gTraceTestValidation = false;
const char *gPerfCounters = nullptr;
const char *gUseANGLE = nullptr;
const char *gUseGL = nullptr;
bool gOffscreen = false;
bool gVsync = false;
bool gRunToKeyFrame = false;
int gFixedTestTime = 0;
int gFixedTestTimeWithWarmup = 0;
const char *gTraceInterpreter = nullptr;
const char *gPrintExtensionsToFile = nullptr;
const char *gRequestedExtensions = nullptr;
bool gIncludeInactiveResources = false;
namespace
{
bool PerfTestArg(int *argc, char **argv, int argIndex)
{
return ParseFlag("--run-to-key-frame", argc, argv, argIndex, &gRunToKeyFrame) ||
ParseFlag("--enable-trace", argc, argv, argIndex, &gEnableTrace) ||
ParseFlag("-v", argc, argv, argIndex, &gVerboseLogging) ||
ParseFlag("--verbose", argc, argv, argIndex, &gVerboseLogging) ||
ParseFlag("--verbose-logging", argc, argv, argIndex, &gVerboseLogging) ||
ParseFlag("--no-finish", argc, argv, argIndex, &gNoFinish) ||
ParseFlag("--warmup", argc, argv, argIndex, &gWarmup) ||
ParseCStringArg("--trace-file", argc, argv, argIndex, &gTraceFile) ||
ParseCStringArg("--perf-counters", argc, argv, argIndex, &gPerfCounters) ||
ParseIntArg("--steps-per-trial", argc, argv, argIndex, &gStepsPerTrial) ||
ParseIntArg("--max-steps-performed", argc, argv, argIndex, &gMaxStepsPerformed) ||
ParseIntArg("--fixed-test-time", argc, argv, argIndex, &gFixedTestTime) ||
ParseIntArg("--fixed-test-time-with-warmup", argc, argv, argIndex,
&gFixedTestTimeWithWarmup) ||
ParseIntArg("--trial-time", argc, argv, argIndex, &gTrialTimeSeconds) ||
ParseIntArg("--max-trial-time", argc, argv, argIndex, &gTrialTimeSeconds) ||
ParseIntArg("--trials", argc, argv, argIndex, &gTestTrials);
}
bool TraceTestArg(int *argc, char **argv, int argIndex)
{
return ParseFlag("--retrace-mode", argc, argv, argIndex, &gRetraceMode) ||
ParseFlag("--validation", argc, argv, argIndex, &gTraceTestValidation) ||
ParseFlag("--save-screenshots", argc, argv, argIndex, &gSaveScreenshots) ||
ParseFlag("--offscreen", argc, argv, argIndex, &gOffscreen) ||
ParseFlag("--vsync", argc, argv, argIndex, &gVsync) ||
ParseFlag("--minimize-gpu-work", argc, argv, argIndex, &gMinimizeGPUWork) ||
ParseCStringArg("--trace-interpreter", argc, argv, argIndex, &gTraceInterpreter) ||
ParseIntArg("--screenshot-frame", argc, argv, argIndex, &gScreenshotFrame) ||
ParseCStringArgWithHandling("--render-test-output-dir", argc, argv, argIndex,
&gRenderTestOutputDir, ArgHandling::Preserve) ||
ParseCStringArg("--screenshot-dir", argc, argv, argIndex, &gScreenshotDir) ||
ParseCStringArg("--use-angle", argc, argv, argIndex, &gUseANGLE) ||
ParseCStringArg("--use-gl", argc, argv, argIndex, &gUseGL) ||
ParseCStringArg("--print-extensions-to-file", argc, argv, argIndex,
&gPrintExtensionsToFile) ||
ParseCStringArg("--request-extensions", argc, argv, argIndex, &gRequestedExtensions) ||
ParseFlag("--include-inactive-resources", argc, argv, argIndex,
&gIncludeInactiveResources);
}
} // namespace
} // namespace angle
using namespace angle;
void ANGLEProcessPerfTestArgs(int *argc, char **argv)
{
for (int argIndex = 1; argIndex < *argc;)
{
if (!PerfTestArg(argc, argv, argIndex))
{
argIndex++;
}
}
if (gRunToKeyFrame || gMaxStepsPerformed > 0)
{
// Ensure defaults were provided for params we're about to set
ASSERT(gTestTrials == kDefaultTestTrials && gTrialTimeSeconds == kDefaultTrialTimeSeconds);
gTestTrials = 1;
gTrialTimeSeconds = 36000;
}
if (gFixedTestTime != 0)
{
// Ensure defaults were provided for params we're about to set
ASSERT(gTrialTimeSeconds == kDefaultTrialTimeSeconds &&
gStepsPerTrial == kDefaultStepsPerTrial && gTestTrials == kDefaultTestTrials);
gTrialTimeSeconds = gFixedTestTime;
gStepsPerTrial = std::numeric_limits<int>::max();
gTestTrials = 1;
}
if (gFixedTestTimeWithWarmup != 0)
{
// Ensure defaults were provided for params we're about to set
ASSERT(gTrialTimeSeconds == kDefaultTrialTimeSeconds &&
gStepsPerTrial == kDefaultStepsPerTrial && gTestTrials == kDefaultTestTrials);
// This option is primarily useful for trace replays when you want to iterate once through
// the trace to warm caches, then run for a fixed amount of time. It is equivalent to:
// --trial-time X --steps-per-trial INF --trials 1 --warmup
gTrialTimeSeconds = gFixedTestTimeWithWarmup;
gStepsPerTrial = std::numeric_limits<int>::max();
gTestTrials = 1;
gWarmup = true;
}
if (gTrialTimeSeconds == 0)
{
gTrialTimeSeconds = 10;
}
}
void ANGLEProcessTraceTestArgs(int *argc, char **argv)
{
ANGLEProcessPerfTestArgs(argc, argv);
for (int argIndex = 1; argIndex < *argc;)
{
if (!TraceTestArg(argc, argv, argIndex))
{
argIndex++;
}
}
if (gScreenshotDir)
{
// implicitly set here but not when using kRenderTestOutputDir
gSaveScreenshots = true;
}
if (gRenderTestOutputDir)
{
gScreenshotDir = gRenderTestOutputDir;
}
if (gTraceTestValidation)
{
gTestTrials = 1;
gTrialTimeSeconds = 600;
}
}