Update plb2 benchmarks

benchmarks/matmul.rb

@@ -1,43 +1,46 @@
 require_relative '../harness/loader'
 
 def matgen(n)
-	tmp = 1.0 / n / n
-  	a = Array.new(n) { Array.new(n) { 0 } }
-	for i in 0 .. n-1
-		for j in 0 .. n-1
-			a[i][j] = tmp * (i - j) * (i + j)
-		end
-	end
-	return a
+  tmp = 1.0 / n / n
+  Array.new(n) { |i|
+    Array.new(n) { |j|
+      tmp * (i - j) * (i + j)
+    }
+  }
 end
 
 def matmul(a, b)
-	m = a.length
-	n = a[0].length
-	p = b[0].length
-  	c = Array.new(m) { Array.new(p) { 0 } }
-	for i in 0 .. m-1
-		ci = c[i]
-		for k in 0 .. n-1
-			aik = a[i][k]
-			bk = b[k]
-			for j in 0 .. p-1
-				ci[j] += aik * bk[j]
-			end
-		end
-	end
-	return c
+  m = a.length
+  n = a[0].length
+  p = b[0].length
+  c = Array.new(m) { Array.new(p, 0.0) }
+  for i in 0...m
+    ci = c[i]
+    ai = a[i]
+    k = 0
+    while k < n
+      aik = ai[k]
+      bk = b[k]
+      j = 0
+      while j < p
+        ci[j] += aik * bk[j]
+        j += 1
+      end
+      k += 1
+    end
+  end
+  c
 end
 
 n = 300
-if ARGV.length >= 1
-	n = ARGV[0].to_i
+if ARGV.length > 0
+  n = ARGV[0].to_i
 end
 n = n / 2 * 2
 
 run_benchmark(20) do
-	a = matgen(n)
-	b = matgen(n)
-	c = matmul(a, b)
-	#puts c[n/2][n/2]
+  a = matgen(n)
+  b = matgen(n)
+  c = matmul(a, b)
+  # puts c[n / 2][n / 2]
 end

benchmarks/nqueens.rb

@@ -1,44 +1,46 @@
 require_relative '../harness/loader'
 
 def nq_solve(n)
-	a = Array.new(n) { -1 }
-	l = Array.new(n) { 0 }
-	c = Array.new(n) { 0 }
-	r = Array.new(n) { 0 }
-	y0 = (1<<n) - 1
-	m = 0
-	k = 0
-	while k >= 0 do
-		y = (l[k] | c[k] | r[k]) & y0
-		if (y ^ y0) >> (a[k] + 1) != 0 then
-			i = a[k] + 1
-			while i < n and (y & 1<<i) != 0 do
-				i += 1
-			end
-			if k < n - 1 then
-				z = 1<<i
-				a[k] = i
-				k += 1
-				l[k] = (l[k-1]|z)<<1
-				c[k] = c[k-1]|z
-				r[k] = (r[k-1]|z)>>1
-			else
-				m += 1
-				k -= 1
-			end
-		else
-			a[k] = -1
-			k -= 1
-		end
-	end
-	return m
+  a = Array.new(n, -1)
+  l = Array.new(n, 0)
+  c = Array.new(n, 0)
+  r = Array.new(n, 0)
+  y0 = (1 << n) - 1
+  m = 0
+  k = 0
+
+  while k >= 0
+    y = (l[k] | c[k] | r[k]) & y0
+    if (y ^ y0) >> (a[k] + 1) != 0
+      i = a[k] + 1
+      while i < n && (y & 1 << i) != 0
+        i += 1
+      end
+      if k < n - 1
+        z = 1 << i
+        a[k] = i
+        k += 1
+        l[k] = (l[k-1] | z) << 1
+        c[k] = c[k-1] | z
+        r[k] = (r[k-1] | z) >> 1
+      else
+        m += 1
+        k -= 1
+      end
+    else
+      a[k] = -1
+      k -= 1
+    end
+  end
+
+  m
 end
 
 n = 12
-if ARGV.length() > 0 then
-	n = ARGV[0].to_i
+if ARGV.length > 0
+  n = ARGV[0].to_i
 end
 
 run_benchmark(40) do
-	nq_solve(n)
+  nq_solve(n)
 end