Fix for issue #25291: inconsistency in python printfd microbenchmark (#25456)

Author: johnfgibson

test/perf/micro/Makefile

@@ -58,7 +58,7 @@ bin/perf%: perf.c perf.h
 bin/fperf%: perf.f90
 	mkdir -p mods/$@ #Modules for each binary go in separate directories
 #	$(FC) $(FFLAGS) -Jmods/$@ -O$* $< -o $@ $(LIBBLAS) -L$(LIBMDIR) $(LIBM) -lpthread
-	$(FC) $(FFLAGS) -Jmods/$@ -O$* $< -o $@ -lblas -L$(LIBMDIR) $(LIBM) -lpthread
+	$(FC) $(FFLAGS) -Jmods/$@ -O$* $< -o $@ -lopenblas -L$(LIBMDIR) $(LIBM) -lpthread
 
 benchmarks/c.csv: \
 	benchmarks/c0.csv \

test/perf/micro/bin/table.pl

@@ -51,7 +51,7 @@
 #  "stata"      => ["Stata"            , $stata_ver ],
 );
 
-our @systems = qw(c julia lua fortran go java javascript mathematica python matlab r octave);
+our @systems = qw(c julia lua go fortran java javascript matlab mathematica python r octave);
 
 print qq[<!-- Table generated by the Perl script test/perf/micro/bin/table.pl in the main julia repository -->\n];
 print qq[<table class="benchmarks">\n];

test/perf/micro/java/src/main/java/PerfPure.java

@@ -149,7 +149,7 @@ void printfd(int n) {
             PrintStream ps = new PrintStream(f);
             long i = 0;
             for (i = 0; i < n; i++) {
-                ps.println(i+" "+i);
+                ps.println(i + " " + (i+1));
             }
             ps.close();
         } catch (FileNotFoundException e) {

test/perf/micro/perf.R

@@ -44,7 +44,7 @@ timeit("parse_integers", parseintperf, 1000)
 printfdperf = function(t) {
     fd<-file("/dev/null")
     for (i in 1:t) {
-        s = sprintf("%d %d", i, i)
+        s = sprintf("%d %d", i, i+1)
 	writeLines(s, fd)
     }	
 }

test/perf/micro/perf.c

@@ -223,7 +223,7 @@ void printfd(int n) {
     FILE *f = fopen("/dev/null", "w");
     long i = 0;
     for (i = 0; i < n; i++)
-        fprintf(f, "%ld %ld\n", i, i);
+        fprintf(f, "%ld %ld\n", i, i+1);
     fclose(f);
 }
 

test/perf/micro/perf.f90

@@ -193,9 +193,9 @@ integer function parse_int(s, base) result(n)
 subroutine printfd(n)
 integer, intent(in) :: n
 integer :: i , unit
-open(unit=1, file="foo")
+open(unit=1, file="/dev/null")
 do i = 1, n
-    write(unit=1, fmt=*) i, i
+    write(unit=1, fmt=*) i, i+1
 end do
 close(unit=1)
 end subroutine

test/perf/micro/perf.go

@@ -64,7 +64,7 @@ func printfd(n int) {
 	w := bufio.NewWriter(f)
 
 	for i := 0; i < n; i++ {
-		_, err = fmt.Fprintf(w, "%d %d\n", i, i)
+		_, err = fmt.Fprintf(w, "%d %d\n", i, i+1)
 	}
 	w.Flush()
 	f.Close()

test/perf/micro/perf.jl

@@ -1,6 +1,8 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
 using Test
+using Printf
+
 
 include("../perfutil.jl")
 

test/perf/micro/perf.m

@@ -107,7 +107,7 @@ function timeit(name, func, varargin)
 %% mandelbrot set: complex arithmetic and comprehensions %%
 
 function r = abs2(z)
-    r = real(z)*real(z) + imag(z)*imag(z)
+    r = real(z)*real(z) + imag(z)*imag(z);
 end
 
 function n = mandel(z)
@@ -228,7 +228,7 @@ function timeit(name, func, varargin)
 function printfd(n)
     f = fopen('/dev/null','w');
     for i = 1:n
-        fprintf(f, '%d %d\n', i, i);
+        fprintf(f, '%d %d\n', i, i + 1);
     end
     fclose(f);
 end

test/perf/micro/perf.nb

@@ -72,7 +72,7 @@ printfdperf[t_] := Module[
 	filename = "/dev/null";
 	fd = OpenWrite[filename];
 	For[i=1, i<=t, ++i,
-		 WriteString[fd, StringForm["`1` `2`\n", i, i]];
+		 WriteString[fd, StringForm["`1` `2`\n", i, i + 1]];
 	];
 	Close[fd];
 ];

test/perf/micro/perf.py

@@ -105,7 +105,7 @@ def parse_int(t):
 def printfd(t):
     f = open("/dev/null", "w")
     for i in range(1,t):
-        f.write("%d %d\n")
+        f.write("{:d} {:d}\n".format(i, i+1))
     f.close()
 
 

test/perf/perfutil.jl

@@ -1,5 +1,7 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
+using Printf
+
 const mintrials = 5
 const mintime = 2000.0
 print_output = isempty(ARGS)
@@ -69,19 +71,21 @@ end
 
 macro timeit(ex,name,desc,group...)
     quote
-        t = Float64[]
-        tot = 0.0
-        i = 0
-        while i < mintrials || tot < mintime
-            e = 1000*(@elapsed $(esc(ex)))
-            tot += e
-            if i > 0
-                # warm up on first iteration
-                push!(t, e)
+        let
+            t = Float64[]
+            tot = 0.0
+            i = 0
+            while i < mintrials || tot < mintime
+                e = 1000*(@elapsed $(esc(ex)))
+                tot += e
+                if i > 0
+                    # warm up on first iteration
+                    push!(t, e)
+                end
+                i += 1
             end
-            i += 1
+            @output_timings t $(esc(name)) $(esc(desc)) $(esc(group))
         end
-        @output_timings t $(esc(name)) $(esc(desc)) $(esc(group))
     end
 end