[[ Benchmarks ]] Add support for variants of a single benchmark.

runrevmark · runrevmark · commit 72a2bca856e2 · 2015-11-19T13:16:06.000Z
A single benchmark command may now issue multiple StartTiming and
StopTiming calls, passing an optional parameter 'variant'.

The log output has been changed to be lines of the form:

&lt;BenchmarkName&gt; tab &lt;Variant&gt; tab &lt;TimeInMS&gt;

If no 'variant' parameter is given to StartTiming, it is presumed
to be empty.

Additional a 'BenchmarkLoadNativeTextFile' command has been added
which loads the given file, searched for relative to the benchmark
script file, as a native encoded text file.
diff --git a/benchmarks/_benchmarklib.livecodescript b/benchmarks/_benchmarklib.livecodescript
@@ -25,15 +25,31 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 ----------------------------------------------------------------
 
 local sBenchmarkStartTime
+local sBenchmarkVariant
 
-on BenchmarkStartTiming
-	put the millisecs into sBenchmarkStartTime
+on BenchmarkStartTiming pVariant
+   put pVariant into sBenchmarkVariant
+   put the millisecs into sBenchmarkStartTime
 end BenchmarkStartTiming
 
 on BenchmarkStopTiming
-	write (the millisecs - sBenchmarkStartTime) to stdout
+   write sBenchmarkVariant & tab & (the millisecs - sBenchmarkStartTime) & return to stdout
 end BenchmarkStopTiming
 
+on BenchmarkLoadNativeTextFile pFilename
+   set the itemDelimiter to slash
+   put item 1 to -2 of the filename of the target & slash & pFilename into pFilename
+   
+   get url ("binfile:" & pFilename)
+   if the result is not empty then
+      throw "BenchmarkLoadNativeTextFile" && quote & pFilename & quote && "failed" & return & it
+   end if
+   replace crlf with lf in it
+   replace numToChar(13) with lf in it
+   
+   return it
+end BenchmarkLoadNativeTextFile
+
 on errorDialog executionError, parseError
    write executionError & return to stderr
    quit 1
diff --git a/benchmarks/_benchmarkrunner.livecodescript b/benchmarks/_benchmarkrunner.livecodescript
@@ -214,10 +214,11 @@ end runSingleScript
 -- Run a specific named benchmark command tCommand in a script file
 -- tScriptFile
 private command runSingleCommand pInfo, pScriptFile, pCommand
-   local tArg, tCommandLine
-   
-   write "Running " & pCommand & "... " to stdout
+   local tBenchmarkName
+   put char 10 to -1 of pCommand into tBenchmarkName
+   write "Running " & tBenchmarkName & "..." & return to stdout
    
+   local tArg, tCommandLine
    repeat for each element tArg in pInfo["self-command"]
       put tArg & " " after tCommandLine
    end repeat
@@ -226,18 +227,32 @@ private command runSingleCommand pInfo, pScriptFile, pCommand
    
    -- Invoke the test in a subprocess.  This ensures that we can detect
    -- if a crash occurs
-   local tBenchmarkTime, tBenchmarkExitStatus
-   put shell(tCommandLine) into tBenchmarkTime
+   local tBenchmarkTimes, tBenchmarkExitStatus
+   put shell(tCommandLine) into tBenchmarkTimes
    put the result into tBenchmarkExitStatus
    
-   -- Check the exit status. 
+   -- The output from the shell will be a list of tab separated lines.
+   --   <variantname> tab <timetaken>
+   
+   -- Check the exit status and process for logging.
    if tBenchmarkExitStatus is not empty then
-      put "failed" into tBenchmarkTime
+      write tab & "failed" & return to stdout
+      write tBenchmarkTimes & return to stderr
+      return tBenchmarkName & tab & "failed" & return
    end if
    
-   write tBenchmarkTime & " ms" & return to stdout
+   local tLog
+   set the itemDelimiter to tab
+   repeat for each line tResult in tBenchmarkTimes
+      if item 1 of tResult is not empty then
+         write tab & item 1 of tResult & space & item 2 of tResult & " ms" & return to stdout
+      else
+         write tab & item 2 of tResult & " ms" & return to stdout
+      end if
+      put tBenchmarkName & tab & tResult & return after tLog
+   end repeat
    
-   return pCommand & tab & tBenchmarkTime & return
+   return tLog
 end runSingleCommand
 
 -- Get all livecode script files beneath the CWD, apart from
