X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=cli%2Fcli_trim.cpp;h=342e66b02e831c2b22a5d9a63d4a17e98c9a48d1;hb=ec8f5a61f393e75e4c3e3e22f84c773af66810e9;hp=c2bb887c4c7ed0f239c1dd23589b15bf0ced07b6;hpb=8efbe01f8cbd25ee9a731fd1d61f61337a108195;p=apitrace diff --git a/cli/cli_trim.cpp b/cli/cli_trim.cpp index c2bb887..342e66b 100644 --- a/cli/cli_trim.cpp +++ b/cli/cli_trim.cpp @@ -53,12 +53,15 @@ usage(void) " --calls=CALLSET Include specified calls in the trimmed output.\n" " --frames=FRAMESET Include specified frames in the trimmed output.\n" " --deps Include additional calls to satisfy dependencies\n" - " --no-deps Do not include calls from dependency analysis\n" - " --prune Omit uninteresting calls from the trace output\n" - " --no-prune Do not prune uninteresting calls from the trace.\n" - " -x, --exact Trim exactly to calls specified in --calls/--frames\n" + " --no-deps Do not include any more calls than requestd\n" + " --prune Omit calls without side effects from the output\n" + " --no-prune Do not omit any requested calls\n" + " -a, --auto Trim automatically to calls specified in --calls/--frames\n" + " Equivalent to both --deps and --prune\n" + " --exact Trim to exactly the calls specified in --calls/--frames\n" " Equivalent to both --no-deps and --no-prune\n" " --print-callset Print the final set of calls included in output\n" + " --trim-spec=SPEC Only performing trimming as described in SPEC\n" " --thread=THREAD_ID Only retain calls from specified thread\n" " -o, --output=TRACE_FILE Output trace file\n" ; @@ -75,39 +78,51 @@ help() "\n" " --calls=CALLSET Include specified calls in the trimmed output.\n" " --frames=FRAMESET Include specified frames in the trimmed output.\n" - " Note that due to dependency analysis and pruning\n" - " of uninteresting calls the resulting trace may\n" - " include more and less calls than specified.\n" - " See --no-deps, --no-prune, and --exact to change\n" - " this behavior.\n" "\n" " --deps Perform dependency analysis and include dependent\n" " calls as needed, (even if those calls were not\n" " explicitly requested with --calls or --frames).\n" - " This is the default behavior. See --no-deps and\n" - " --exact to change the behavior.\n" - "\n" - " --no-deps Do not perform dependency analysis. In this mode\n" - " the trimmed trace will never include calls from\n" - " outside what is specified in --calls or --frames.\n" + " (On by default. See --no-deps or --exact)\n" + " --no-deps Do not perform dependency analysis. Output will\n" + " not include any additional calls beyond those\n" + " explicitly requested with --calls or --frames).\n" "\n" " --prune Omit calls with no side effects, even if the call\n" " is within the range specified by --calls/--frames.\n" - " This is the default behavior. See --no-prune.\n" + " (On by default. See --no-prune or --exact)\n" "\n" - " --no-prune Do not prune uninteresting calls from the trace.\n" - " In this mode the trimmed trace will never omit\n" - " any calls within the user-specified range.\n" + " --no-prune Never omit any calls from the range specified\n" + " --calls/--frames.\n" "\n" - " -x, --exact Trim the trace to exactly the calls specified in\n" - " --calls and --frames. This option is equivalent\n" + " -a, --auto Use dependency analysis and pruning\n" + " of uninteresting calls the resulting trace may\n" + " include more and less calls than specified.\n" + " This option is equivalent\n" + " to passing both --deps and --prune and is on by\n" + " default (see --no-deps, --no-prune and --exact)\n" + "\n" + " --exact Trim output to exact the calls or frames\n" + " specified with --calls or --frames.\n" + " This option is equivalent\n" " to passing both --no-deps and --no-prune.\n" "\n" " --print-callset Print to stdout the final set of calls included\n" " in the trim output. This can be useful for\n" - " debugging trim operations by using a modified\n" - " callset on the command-line along with --exact.\n" - " Use --calls=@ to read callset from a file.\n" + " tweaking the trimmed callset from --auto on the\n" + " command-line.\n" + " Use --calls=@FILE to read callset from a file.\n" + " --trim-spec=SPEC Specifies which classes of calls will be trimmed.\n" + " This option only has an effect if dependency\n" + " analysis is enabled. The argument is a comma-\n" + " separated list of names from the following:\n" + "\n" + " no-side-effects Calls with no side effects\n" + " textures Calls to setup unused textures\n" + " shaders Calls to setup unused shaders\n" + " drawing Calls that draw\n" + "\n" + " The default trim specification includes all of\n" + " the above, (as much as possible will be trimmed).\n" "\n" " --thread=THREAD_ID Only retain calls from specified thread\n" "\n" @@ -125,10 +140,12 @@ enum { NO_PRUNE_OPT, THREAD_OPT, PRINT_CALLSET_OPT, + TRIM_SPEC_OPT, + EXACT_OPT }; const static char * -shortOptions = "ho:x"; +shortOptions = "aho:x"; const static struct option longOptions[] = { @@ -139,10 +156,12 @@ longOptions[] = { {"no-deps", no_argument, 0, NO_DEPS_OPT}, {"prune", no_argument, 0, PRUNE_OPT}, {"no-prune", no_argument, 0, NO_PRUNE_OPT}, - {"exact", no_argument, 0, 'x'}, + {"auto", no_argument, 0, 'a'}, + {"exact", no_argument, 0, EXACT_OPT}, {"thread", required_argument, 0, THREAD_OPT}, {"output", required_argument, 0, 'o'}, {"print-callset", no_argument, 0, PRINT_CALLSET_OPT}, + {"trim-spec", required_argument, 0, TRIM_SPEC_OPT}, {0, 0, 0, 0} }; @@ -173,6 +192,9 @@ struct trim_options { /* Print resulting callset */ int print_callset; + + /* What kind of trimming to perform. */ + TrimFlags trim_flags; }; static int @@ -180,8 +202,8 @@ trim_trace(const char *filename, struct trim_options *options) { trace::ParseBookmark beginning; trace::Parser p; - TraceAnalyzer analyzer; - std::set *required; + TraceAnalyzer analyzer(options->trim_flags); + trace::FastCallSet *required; unsigned frame; int call_range_first, call_range_last; @@ -198,11 +220,11 @@ trim_trace(const char *filename, struct trim_options *options) trace::Call *call; while ((call = p.parse_call())) { - /* There's no use doing any work past the last call or frame + /* There's no use doing any work past the last call and frame * requested by the user. */ - if (call->no > options->calls.getLast() || - frame > options->frames.getLast()) { - + if ((options->calls.empty() || call->no > options->calls.getLast()) && + (options->frames.empty() || frame > options->frames.getLast())) { + delete call; break; } @@ -212,8 +234,8 @@ trim_trace(const char *filename, struct trim_options *options) goto NEXT; } - /* Also, prune if uninteresting (unless the user asked for no pruning. */ - if (options->prune_uninteresting && call->flags & trace::CALL_FLAG_UNINTERESTING) { + /* Also, prune if no side effects (unless the user asked for no pruning. */ + if (options->prune_uninteresting && call->flags & trace::CALL_FLAG_NO_SIDE_EFFECTS) { goto NEXT; } @@ -266,15 +288,15 @@ trim_trace(const char *filename, struct trim_options *options) call_range_last = -1; while ((call = p.parse_call())) { - /* There's no use doing any work past the last call or frame + /* There's no use doing any work past the last call and frame * requested by the user. */ - if (call->no > options->calls.getLast() || - frame > options->frames.getLast()) { + if ((options->calls.empty() || call->no > options->calls.getLast()) && + (options->frames.empty() || frame > options->frames.getLast())) { break; } - if (required->find(call->no) != required->end()) { + if (required->contains(call->no)) { writer.writeCall(call); if (options->print_callset) { @@ -303,7 +325,43 @@ trim_trace(const char *filename, struct trim_options *options) printf ("-%d\n", call_range_last); } - std::cout << "Trimmed trace is available as " << options->output << "\n"; + std::cerr << "Trimmed trace is available as " << options->output << "\n"; + + return 0; +} + +static int +parse_trim_spec(const char *trim_spec, TrimFlags *flags) +{ + std::string spec(trim_spec), word; + size_t start = 0, comma = 0; + *flags = 0; + + while (start < spec.size()) { + comma = spec.find(',', start); + + if (comma == std::string::npos) + word = std::string(spec, start); + else + word = std::string(spec, start, comma - start); + + if (strcmp(word.c_str(), "no-side-effects") == 0) + *flags |= TRIM_FLAG_NO_SIDE_EFFECTS; + else if (strcmp(word.c_str(), "textures") == 0) + *flags |= TRIM_FLAG_TEXTURES; + else if (strcmp(word.c_str(), "shaders") == 0) + *flags |= TRIM_FLAG_SHADERS; + else if (strcmp(word.c_str(), "drawing") == 0) + *flags |= TRIM_FLAG_DRAWING; + else { + return 1; + } + + if (comma == std::string::npos) + break; + + start = comma + 1; + } return 0; } @@ -320,6 +378,7 @@ command(int argc, char *argv[]) options.output = ""; options.thread = -1; options.print_callset = 0; + options.trim_flags = -1; int opt; while ((opt = getopt_long(argc, argv, shortOptions, longOptions, NULL)) != -1) { @@ -345,7 +404,11 @@ command(int argc, char *argv[]) case NO_PRUNE_OPT: options.prune_uninteresting = false; break; - case 'x': + case 'a': + options.dependency_analysis = true; + options.prune_uninteresting = true; + break; + case EXACT_OPT: options.dependency_analysis = false; options.prune_uninteresting = false; break; @@ -358,6 +421,13 @@ command(int argc, char *argv[]) case PRINT_CALLSET_OPT: options.print_callset = 1; break; + case TRIM_SPEC_OPT: + if (parse_trim_spec(optarg, &options.trim_flags)) { + std::cerr << "error: illegal value for trim-spec: " << optarg << "\n"; + std::cerr << "See \"apitrace help trim\" for help.\n"; + return 1; + } + break; default: std::cerr << "error: unexpected option `" << opt << "`\n"; usage(); @@ -387,6 +457,14 @@ command(int argc, char *argv[]) return 1; } + if (options.dependency_analysis) { + std::cerr << + "Note: The dependency analysis in \"apitrace trim\" is still experimental.\n" + " We hope that it will be useful, but it may lead to incorrect results.\n" + " If you find a trace that misbehaves while trimming, please share that\n" + " by sending email to apitrace@lists.freedesktop.org, cworth@cworth.org\n"; + } + return trim_trace(argv[optind], &options); }