[llvm] r335108 - [llvm-exegesis] Fix missing move in r335105.

[Clement Courbet via llvm-commits]

Author: courbet
Date: Wed Jun 20 02:18:32 2018
New Revision: 335108

URL: http://llvm.org/viewvc/llvm-project?rev=335108&view=rev
Log:
[llvm-exegesis] Fix missing move in r335105.

Modified:
    llvm/trunk/tools/llvm-exegesis/lib/Latency.cpp
    llvm/trunk/tools/llvm-exegesis/lib/Uops.cpp

Modified: llvm/trunk/tools/llvm-exegesis/lib/Latency.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Latency.cpp?rev=335108&r1=335107&r2=335108&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Latency.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Latency.cpp Wed Jun 20 02:18:32 2018
@@ -64,7 +64,7 @@ LatencyBenchmarkRunner::generateSelfAlia
     setRandomAliasing(SelfAliasing, II, II);
   }
   Prototype.Snippet.push_back(std::move(II));
-  return Prototype;
+  return std::move(Prototype);
 }
 
 llvm::Expected<SnippetPrototype>
@@ -99,7 +99,7 @@ LatencyBenchmarkRunner::generateTwoInstr
                                           MCInstrInfo.getName(OtherOpcode));
     Prototype.Snippet.push_back(std::move(ThisII));
     Prototype.Snippet.push_back(std::move(OtherII));
-    return Prototype;
+    return std::move(Prototype);
   }
   return llvm::make_error<BenchmarkFailure>(
       "Infeasible : Didn't find any scheme to make the instruction serial");

Modified: llvm/trunk/tools/llvm-exegesis/lib/Uops.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/Uops.cpp?rev=335108&r1=335107&r2=335108&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-exegesis/lib/Uops.cpp (original)
+++ llvm/trunk/tools/llvm-exegesis/lib/Uops.cpp Wed Jun 20 02:18:32 2018
@@ -147,13 +147,13 @@ UopsBenchmarkRunner::generatePrototype(u
     SnippetPrototype Prototype;
     Prototype.Explanation = "instruction is parallel, repeating a random one.";
     Prototype.Snippet.emplace_back(Instr);
-    return Prototype;
+    return std::move(Prototype);
   }
   if (SelfAliasing.hasImplicitAliasing()) {
     SnippetPrototype Prototype;
     Prototype.Explanation = "instruction is serial, repeating a random one.";
     Prototype.Snippet.emplace_back(Instr);
-    return Prototype;
+    return std::move(Prototype);
   }
   const auto TiedVariables = getTiedVariables(Instr);
   if (!TiedVariables.empty()) {
@@ -174,7 +174,7 @@ UopsBenchmarkRunner::generatePrototype(u
       Prototype.Snippet.back().getValueFor(*Var) =
           llvm::MCOperand::createReg(Reg);
     }
-    return Prototype;
+    return std::move(Prototype);
   }
   InstructionInstance II(Instr);
   // No tied variables, we pick random values for defs.
@@ -205,7 +205,7 @@ UopsBenchmarkRunner::generatePrototype(u
   Prototype.Explanation =
       "instruction has no tied variables picking Uses different from defs";
   Prototype.Snippet.push_back(std::move(II));
-  return Prototype;
+  return std::move(Prototype);
 }
 
 std::vector<BenchmarkMeasure>