Fic clock choose, jit detect

Author: EntityFX

src/lua/dhrystone/dhrystone.lua

@@ -45,7 +45,10 @@ function Dhrystone2:bench(loops)
     self.output:writeLine("")
     self.output:writeLine("Dhrystone Benchmark, Version 2.1 (Language: Lua)")
     self.output:writeLine("")
-    self.output:writeLine("Optimization %s", "Optimised")
+
+    local optimization = getVersion() .. ((jit and jit.status() == true) and " Optimised" or " Not optimised")
+
+    self.output:writeLine("Optimization: %s", optimization)
 
     local result = self:Proc0(loops)
 

src/lua/main.lua

@@ -25,6 +25,13 @@ if _ENV then
 	unpack = table.unpack
 end
 
+if #arg > 0 then
+    if arg[1] == "1" then
+        useTimeForClock = true
+    end
+end
+print("useTimeForClock=", useTimeForClock)
+
 function writeResult(writer, benchResult)
     writer:writeTitle("%-30s", benchResult.benchmarkName)
     writer:writeValue("%15d ms", benchResult.elapsed)
@@ -40,18 +47,18 @@ local writer = Writer("Output.log")
 BenchmarkBase.IterrationsRatio = 0.1
 
 benchmarks = {
-    -- ArithemticsBenchmark(writer, true),
-    -- MathBenchmark(writer, true),
-    -- CallBenchmark(writer, true),
-    -- IfElseBenchmark(writer, true),
-    -- StringManipulation(writer, true),
-    -- MemoryBenchmark(writer, true),
-    -- RandomMemoryBenchmark(writer, true),
-    -- Scimark2Benchmark(writer, true),
+    ArithemticsBenchmark(writer, true),
+    MathBenchmark(writer, true),
+    CallBenchmark(writer, true),
+    IfElseBenchmark(writer, true),
+    StringManipulation(writer, true),
+    MemoryBenchmark(writer, true),
+    RandomMemoryBenchmark(writer, true),
+    Scimark2Benchmark(writer, true),
     DhrystoneBenchmark(writer, true),
-    -- WhetstoneBenchmark(writer, true),
-    -- LinpackBenchmark(writer, true),
-    -- HashBenchmark(writer, true)
+    WhetstoneBenchmark(writer, true),
+    LinpackBenchmark(writer, true),
+    HashBenchmark(writer, true)
 }
 
 writer:writeHeader("Warmup")
@@ -89,6 +96,7 @@ writer:writeLine()
 
 local os, arch = getOS()
 local osVersion = os .. ' ' .. arch
+local runtime = getVersion()
 
 local headerCommon = "Operating System,Runtime,Threads Count,Memory Used"
 local headerTotals = ",Total Points,Total Time (ms)"
@@ -101,7 +109,7 @@ for i,benchmark in ipairs(benchmarks) do
 end
 writer:writeTitle(headerTotals)
 writer:writeLine()
-writer:writeTitle("%s,%s,%d,%d", osVersion, _VERSION, 1, 0)
+writer:writeTitle("%s,%s,%d,%d", osVersion, runtime, 1, 0)
 for i,point in ipairs(points) do
     writer:writeTitle(",%.2f", point)
 end
@@ -116,7 +124,7 @@ for i,benchmark in ipairs(benchmarks) do
 end
 writer:writeTitle(headerTotals)
 writer:writeLine()
-writer:writeTitle("%s,%s,%d,%d", osVersion, _VERSION, 1, 0)
+writer:writeTitle("%s,%s,%d,%d", osVersion, runtime, 1, 0)
 for i,result in ipairs(results) do
     writer:writeTitle(",%.2f", result)
 end

src/lua/utils.lua

@@ -1,3 +1,5 @@
+useTimeForClock = false
+
 function class(base, init)
     local c = {}    -- a new class instance
     if not init and type(base) == 'function' then
@@ -106,12 +108,26 @@ function sum(x)
 end
 
 function clock()
-   local clk = os.clock() * 1000
+   local clk = 0
+   if (useTimeForClock) then
+      clk = os.time() * 1000
+   else
+      clk = os.clock() * 1000
+   end
+
    return clk
 end
 
 function clockSeconds()
-   return clock() / 1000.0
+   local clk = 0
+   
+   if (useTimeForClock) then
+      clk = os.time()
+   else
+      clk = os.clock()
+   end
+
+   return clk
 end
 
 -- Calculates the arithmetic mean of a set of values
@@ -204,4 +220,29 @@ function getOS()
 		end
 	end
 	return os_name, arch_name
+end
+
+function getVersion()
+   if jit then
+      if jit.version then
+         return jit.version
+      else 
+         return _VERSION .. " JIT"
+      end
+   else
+      return _VERSION
+   end
+end
+
+function dump(o)
+   if type(o) == 'table' then
+      local s = '{ '
+      for k,v in pairs(o) do
+         if type(k) ~= 'number' then k = '"'..k..'"' end
+         s = s .. '['..k..'] = ' .. dump(v) .. ','
+      end
+      return s .. '} '
+   else
+      return tostring(o)
+   end
 end

src/lua/whetstone/whetstone.lua

@@ -21,18 +21,20 @@ function Whetstone:bench(getinput)
 
     local count = 10
     local calibrate = 1
-    local xtra = 1
+    local xtra = 125
     local endit = 0
     local section = 0
     local x100 = 100
     local duration = 100
     local general = {}
     self:writeLine("%s Precision Lua Whetstone Benchmark\n", "Double")
+
     if not getinput then
         self:writeLine("No run time input data\n")
     else
         self:writeLine("With run time input data\n")
     end
+    
     self:writeLine("Calibrate")
     repeat
         self.timeUsed = 0.0