Refactor Lua scripts to be executable on UNIX. Refactored bench.lua to be more compact.

Author: Lethja

bench.lua

@@ -20,28 +20,30 @@ function SystemFamily()
 	end
 end
 
-local function benchmark_pi()
-	local iterations = 100000
-	local pi = 3
-	local sign = 1
+function BenchmarkStart(name, iterations)
+	io.write("Benchmarking " .. name .. "  (" .. iterations .. " iterations)...\t")
+	io.flush()
+	return os.clock()
+end
 
-	io.write("Benchmarking Pi  (" .. iterations .. " iterations)...\t")
+function BenchmarkEnd(start_time)
+	io.write(string.format("%010.6f", os.clock() - start_time) .. " seconds\n")
+end
 
-	local start_time = os.clock()
+local function benchmark_pi()
+	local it, pi, si = 100000, 3, 1
+	local bm = BenchmarkStart("Pi ", it)
 
 	-- Calculate using Nilakantha series
-	for i = 2, iterations * 2, 2 do
-		pi = pi + sign * (4 / (i * (i + 1) * (i + 2)))
-		sign = -sign -- Alternate the sign for each term
+	for i = 2, it * 2, 2 do
+		pi = pi + si * (4 / (i * (i + 1) * (i + 2)))
+		si = -si -- Alternate the sign for each term
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_gcd()
-
 	-- Function to compute the greatest common divisor
 	local function gcd(a, b)
 		while b ~= 0 do
@@ -50,113 +52,82 @@ local function benchmark_gcd()
 		return a
 	end
 
-	local iterations = 100000
-	local result = 0
+	local it, r = 100000, 0
+	local bm = BenchmarkStart("GCD", it)
 
-	io.write("Benchmarking GCD (" .. iterations .. " iterations)...\t")
-
-	local start_time = os.clock()
-
-	for i = 1, iterations do
+	for i = 1, it do
 		local x = i
-		local y = iterations - i + 1
-		result = gcd(x, y)
+		local y = it - i + 1
+		r = gcd(x, y)
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_mul()
-	local iterations = 100000
+	local r, it = 1, 100000
+	local bm = BenchmarkStart("Mul", it)
 
-	io.write("Benchmarking Mul (" .. iterations .. " iterations)...\t")
-
-	local start_time = os.clock()
-	local result = 1
-	for i = 1, iterations do
-		result = (result * i) % 1000000007  -- Keep the result small to avoid overflow
+	for i = 1, it do
+		r = (r * i) % 1000000007  -- Keep the result small to avoid overflow
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_div()
-	local iterations = 100000
+	local it, result = 100000, 1
+	local bm = BenchmarkStart("Div", it)
 
-	io.write("Benchmarking Div (" .. iterations .. " iterations)...\t")
-	iterations = iterations + 1
-
-	local start_time = os.clock()
-	local result = 1
-	for i = 2, iterations do
+	it = it + 1
+	for i = 2, it do
 		result = result / i
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_add()
-	local iterations = 100000
-
-	io.write("Benchmarking Add (" .. iterations .. " iterations)...\t")
+	local r, it = 1, 100000
+	local bm = BenchmarkStart("Add", it)
 
-	local start_time = os.clock()
-	local result = 1
-	for i = 1, iterations do
-		result = result + i
+	for i = 1, it do
+		r = r + i
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_sub()
-	local iterations = 100000
-
-	io.write("Benchmarking Sub (" .. iterations .. " iterations)...\t")
+	local r, it = 1, 100000
+	local bm = BenchmarkStart("Sub", it)
 
-	local start_time = os.clock()
-	local result = 1
-	for i = iterations, 1, -1 do
-		result = result - i
+	for i = it, 1, -1 do
+		r = r - i
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 local function benchmark_array()
-	local elements = 1000
-
-	io.write("Benchmarking Array (" .. elements .. " iterations)...\t")
-
-	local start_time = os.clock()
+	local it = 1000
+	local bm = BenchmarkStart("Array", it)
 
 	local array = {}
-	for i = 1, elements do
+	for i = 1, it do
 		array[i] = i % 10
 	end
 
-	for i = 1, elements do
+	for i = 1, it do
 		array[i] = array[i] * 2
 	end
 
 	local sum = 0
-	for i = 1, elements do
+	for i = 1, it do
 		sum = sum + array[i]
 	end
 
-	local end_time = os.clock()
-
-	io.write(string.format("%.6f", end_time - start_time) .. " seconds\n")
+	BenchmarkEnd(bm)
 end
 
 -- Some information
@@ -169,7 +140,7 @@ print()
 
 -- Run the benchmarks
 
-start_time = os.clock()
+bm = os.clock()
 
 benchmark_add()
 benchmark_sub()
@@ -181,8 +152,6 @@ benchmark_gcd()
 
 benchmark_array()
 
-end_time = os.clock()
-
 print()
 print("Total memory usage (KB):", collectgarbage("count"))
-print("Total benchmark time:   ", string.format("%.6f", end_time - start_time))
+print("Total benchmark seconds:", string.format("%010.6f", os.clock() - bm))