[lld-macho] Make time-trace* options more permissive.

[oontvoo]

Summary

If either time-trace-granularity or time-trace-file is specified, then don't make users specify -time-trace.
It seems silly that I have to type all three options, eg, -time-trace -time-trace-file=- -time-trace-granularity=....

[int3]

lld/test/MachO/time-trace.s

17

technically we should test if *either* of the other two are used :)

[oontvoo]

lld/test/MachO/time-trace.s

17

Done - I've removed the --time-trace from line 11 - that should test it :)

[oontvoo]

updated diff

[int3]

lld/MachO/Driver.cpp

1036–1039

looks like hasArg actually takes a varargs list, so I think this should work

[int3]

lld/MachO/Driver.cpp

1036–1039

Done in https://github.com/llvm/llvm-project/commit/c2e76a9a6dcc09434d47ba9217fa02d997c2401d

[oontvoo]

lld/MachO/Driver.cpp

1036–1039

Thanks!

lld/MachO/Driver.cpp

if (args.hasArg(OPT_v)) {
     message(StringRef("Framework search paths:") +
             (config->frameworkSearchPaths.empty()
                  ? ""
                  : "\n\t" + join(config->frameworkSearchPaths, "\n\t")));
   }
 
   config->progName = argsArr[0];
 
-  config->timeTraceEnabled = args.hasArg(OPT_time_trace);
+  config->timeTraceEnabled = args.hasArg(OPT_time_trace) ||
+                             args.hasArg(OPT_time_trace_granularity_eq) ||
+                             args.hasArg(OPT_time_trace_file_eq);
   config->timeTraceGranularity =
       args::getInteger(args, OPT_time_trace_granularity_eq, 500);
 
   // Initialize time trace profiler.
   if (config->timeTraceEnabled)
     timeTraceProfilerInitialize(config->timeTraceGranularity, config->progName);
 
   {
     TimeTraceScope timeScope("ExecuteLinker");

lld/test/MachO/time-trace.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
 
-# Test implicit trace file name
+## Test implicit trace file name
 # RUN: %lld --time-trace --time-trace-granularity=0 -o %t1.macho %t.o
 # RUN: cat %t1.macho.time-trace \
 # RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 # RUN:   | FileCheck %s
 
-# Test specified trace file name
-# RUN: %lld --time-trace --time-trace-file=%t2.json --time-trace-granularity=0 -o %t2.macho %t.o
+## Test specified trace file name, also test that `--time-trace` is not needed if the other two are used.
+# RUN: %lld --time-trace-file=%t2.json --time-trace-granularity=0 -o %t2.macho %t.o
 # RUN: cat %t2.json \
 # RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 # RUN:   | FileCheck %s
 
-# Test trace requested to stdout
-# RUN: %lld --time-trace --time-trace-file=- --time-trace-granularity=0 -o %t3.macho %t.o \
+## Test trace requested to stdout, also test that `--time-trace` is not needed if the other two are used.
+# RUN: %lld --time-trace-file=- --time-trace-granularity=0 -o %t3.macho %t.o \
 # RUN:   | %python -c 'import json, sys; json.dump(json.loads(sys.stdin.read()), sys.stdout, sort_keys=True, indent=2)' \
 # RUN:   | FileCheck %s
 
 # CHECK:      "beginningOfTime": {{[0-9]{16},}}
 # CHECK-NEXT: "traceEvents": [
 
-# Check one event has correct fields
+## Check one event has correct fields
 # CHECK:      "dur":
 # CHECK-NEXT: "name":
 # CHECK-NEXT: "ph":
 # CHECK-NEXT: "pid":
 # CHECK-NEXT: "tid":
 # CHECK-NEXT: "ts":
 
-# Check there is an ExecuteLinker event
+## Check there is an ExecuteLinker event
 # CHECK: "name": "ExecuteLinker"
 
-# Check process_name entry field
+## Check process_name entry field
 # CHECK: "name": "ld64.lld{{(.exe)?}}"
 # CHECK: "name": "process_name"
 # CHECK: "name": "thread_name"
 
 .globl _main
 _main:
   ret