[llvm] 3e0d37f - llvm-reduce: Simplify argument setup for ExecuteAndWait

[Matt Arsenault via llvm-commits]

Author: Matt Arsenault
Date: 2024-09-23T17:20:38+04:00
New Revision: 3e0d37fd79faeb60a47ed8aace1c594ff7f637f2

URL: https://github.com/llvm/llvm-project/commit/3e0d37fd79faeb60a47ed8aace1c594ff7f637f2
DIFF: https://github.com/llvm/llvm-project/commit/3e0d37fd79faeb60a47ed8aace1c594ff7f637f2.diff

LOG: llvm-reduce: Simplify argument setup for ExecuteAndWait

Only need to append the input file for each iteration.

Added: 
    

Modified: 
    llvm/tools/llvm-reduce/TestRunner.cpp
    llvm/tools/llvm-reduce/TestRunner.h

Removed: 
    


################################################################################
diff  --git a/llvm/tools/llvm-reduce/TestRunner.cpp b/llvm/tools/llvm-reduce/TestRunner.cpp
index 8a61aae64b9029..aac5c4a4fe7a68 100644
--- a/llvm/tools/llvm-reduce/TestRunner.cpp
+++ b/llvm/tools/llvm-reduce/TestRunner.cpp
@@ -13,17 +13,18 @@
 
 using namespace llvm;
 
-TestRunner::TestRunner(StringRef TestName,
-                       const std::vector<std::string> &TestArgs,
+TestRunner::TestRunner(StringRef TestName, ArrayRef<std::string> RawTestArgs,
                        std::unique_ptr<ReducerWorkItem> Program,
                        std::unique_ptr<TargetMachine> TM, StringRef ToolName,
                        StringRef OutputName, bool InputIsBitcode,
                        bool OutputBitcode)
-    : TestName(TestName), ToolName(ToolName), TestArgs(TestArgs),
-      Program(std::move(Program)), TM(std::move(TM)),
-      OutputFilename(OutputName), InputIsBitcode(InputIsBitcode),
-      EmitBitcode(OutputBitcode) {
+    : TestName(TestName), ToolName(ToolName), Program(std::move(Program)),
+      TM(std::move(TM)), OutputFilename(OutputName),
+      InputIsBitcode(InputIsBitcode), EmitBitcode(OutputBitcode) {
   assert(this->Program && "Initialized with null program?");
+
+  TestArgs.push_back(TestName); // argv[0]
+  TestArgs.append(RawTestArgs.begin(), RawTestArgs.end());
 }
 
 static constexpr std::array<std::optional<StringRef>, 3> DefaultRedirects = {
@@ -33,18 +34,13 @@ static constexpr std::array<std::optional<StringRef>, 3> NullRedirects;
 /// Runs the interestingness test, passes file to be tested as first argument
 /// and other specified test arguments after that.
 int TestRunner::run(StringRef Filename) const {
-  std::vector<StringRef> ProgramArgs;
-  ProgramArgs.push_back(TestName);
-
-  for (const auto &Arg : TestArgs)
-    ProgramArgs.push_back(Arg);
-
-  ProgramArgs.push_back(Filename);
+  SmallVector<StringRef> ExecArgs(TestArgs);
+  ExecArgs.push_back(Filename);
 
   std::string ErrMsg;
 
   int Result =
-      sys::ExecuteAndWait(TestName, ProgramArgs, /*Env=*/std::nullopt,
+      sys::ExecuteAndWait(TestName, ExecArgs, /*Env=*/std::nullopt,
                           Verbose ? DefaultRedirects : NullRedirects,
                           /*SecondsToWait=*/0, /*MemoryLimit=*/0, &ErrMsg);
 

diff  --git a/llvm/tools/llvm-reduce/TestRunner.h b/llvm/tools/llvm-reduce/TestRunner.h
index 16d3dcd244a833..930c3248ff1056 100644
--- a/llvm/tools/llvm-reduce/TestRunner.h
+++ b/llvm/tools/llvm-reduce/TestRunner.h
@@ -25,7 +25,7 @@ namespace llvm {
 // respective filename.
 class TestRunner {
 public:
-  TestRunner(StringRef TestName, const std::vector<std::string> &TestArgs,
+  TestRunner(StringRef TestName, ArrayRef<std::string> TestArgs,
              std::unique_ptr<ReducerWorkItem> Program,
              std::unique_ptr<TargetMachine> TM, StringRef ToolName,
              StringRef OutputFilename, bool InputIsBitcode, bool OutputBitcode);
@@ -55,7 +55,7 @@ class TestRunner {
 private:
   StringRef TestName;
   StringRef ToolName;
-  const std::vector<std::string> &TestArgs;
+  SmallVector<StringRef> TestArgs;
   std::unique_ptr<ReducerWorkItem> Program;
   std::unique_ptr<TargetMachine> TM;
   StringRef OutputFilename;