supercop-20110617

cpucycles/apple.c

@@ -0,0 +1,43 @@
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <mach/mach_time.h>
+#include "osfreq.c"
+
+#define timebase mach_absolute_time
+
+static int tbmib[2] = { CTL_HW, HW_TB_FREQ } ;
+
+static long myround(double u)
+{
+  long result = u;
+  while (result + 0.5 < u) result += 1;
+  while (result - 0.5 > u) result -= 1;
+  return result;
+}
+
+static long long cpufrequency = 0;
+static long tbcycles = 0;
+
+static void init(void)
+{
+  unsigned int tbfrequency = 0; size_t tbfrequencylen = sizeof(unsigned int);
+  cpufrequency = osfreq();
+  sysctl(tbmib,2,&tbfrequency,&tbfrequencylen,0,0);
+  if (tbfrequency > 0)
+    tbcycles = myround(64 * (double) (unsigned long long) cpufrequency
+                          / (double) (unsigned long long) tbfrequency);
+}
+
+long long cpucycles_apple(void)
+{
+  if (!cpufrequency) init();
+  return (timebase() * tbcycles) >> 6;
+}
+
+long long cpucycles_apple_persecond(void)
+{
+  if (!cpufrequency) init();
+  return cpufrequency;
+}

cpucycles/apple.h

@@ -0,0 +1,27 @@
+/*
+cpucycles apple.h version 20110616
+D. J. Bernstein
+Public domain.
+*/
+
+#ifndef CPUCYCLES_apple_h
+#define CPUCYCLES_apple_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern long long cpucycles_apple(void);
+extern long long cpucycles_apple_persecond(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#ifndef cpucycles_implementation
+#define cpucycles_implementation "apple"
+#define cpucycles cpucycles_apple
+#define cpucycles_persecond cpucycles_apple_persecond
+#endif
+
+#endif

cpucycles/do

@@ -48,6 +48,7 @@ okabi | (
 	  ;;
       esac
 
+      echo apple
       echo amd64tscfreq
       echo amd64cpuinfo
       echo amd64cpuspeed
@@ -82,7 +83,7 @@ okabi | (
             cp $n.h cpucycles-impl.h || continue
             $c -c cpucycles-impl.c || continue
             $c -o test test.c cpucycles-impl.o || continue
-            ./test || continue
+            killafter 300 ./test || continue
             echo "=== `date` === Success. Using $n.c." >&2
             mkdir -p lib/$abi
             mv cpucycles-impl.o lib/$abi/cpucycles.o

cpucycles/osfreq.c

@@ -4,6 +4,13 @@ static double osfreq(void)
   double result;
   int s;
 
+  f = fopen("/etc/cpucyclespersecond", "r");
+  if (f) {
+    s = fscanf(f,"%lf",&result);
+    fclose(f);
+    if (s > 0) return result;
+  }
+
   f = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq", "r");
   if (f) {
     s = fscanf(f,"%lf",&result);
@@ -42,6 +49,13 @@ static double osfreq(void)
     if (result) return 1000000.0 * result;
   }
 
+  f = popen("sysctl hw.cpufrequency 2>/dev/null","r");
+  if (f) {
+    s = fscanf(f,"hw.cpufrequency: %lf",&result);
+    pclose(f);
+    if (s > 0) if (result > 0) return result;
+  }
+
   f = popen("/usr/sbin/lsattr -E -l proc0 -a frequency 2>/dev/null","r");
   if (f) {
     s = fscanf(f,"frequency %lf",&result);

crypto_hash/fugue384/description

@@ -0,0 +1 @@
+Fugue with 384-bit output

crypto_hash/fugue384/designers

@@ -0,0 +1,3 @@
+Charanjit Jutla
+Shai Halevi
+Eric Hall

crypto_hash/sha256/sphlib-small/implementors

@@ -0,0 +1 @@
+Thomas Pornin

crypto_hash/sha256/sphlib/implementors

@@ -0,0 +1 @@
+Thomas Pornin

crypto_hash/sha512/sphlib-small/implementors

@@ -0,0 +1 @@
+Thomas Pornin

crypto_hash/sha512/sphlib/implementors

@@ -0,0 +1 @@
+Thomas Pornin

data-vars

@@ -7,7 +7,7 @@
 version=`cat version`
 
 project=supercop
-shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
+shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]' | tr '[A-Z]' '[a-z]'`
 
 top="`pwd`/supercop-data/$shorthostname"
 

do

@@ -6,7 +6,7 @@
 
 version=`cat version`
 project=supercop
-shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]'`
+shorthostname=`hostname | sed 's/\..*//' | tr -cd '[a-z][A-Z][0-9]' | tr '[A-Z]' '[a-z]'`
 
 top="`pwd`/bench/$shorthostname"
 bin="$top/bin"

version

@@ -1 +1 @@
-20110609
+20110617