From 308ede9da8dd77b48636246b180f28b7262fdc5c Mon Sep 17 00:00:00 2001
From: chris <chris@pkgsrc.org>
Date: Sat, 5 Apr 2008 14:09:18 +0000
Subject: Fiz mhz calculation for arm.  It seems gcc has become intelligent
 enough to optimize away the loop used for timing.  Do something in the loop
 for arm that can't be optimized away, and will also meet the 1,000
 instructions in the loop requirement.

This allows mhz to calculate sensible Mhz on a StrongArm (228Mhz rather
than 56Mhz)

Other hardware probably also need fixing, as gcc probably applies the same
optimizations on them.

Also bump PKGREVISION.
---
 benchmarks/hbench/Makefile         |  4 ++--
 benchmarks/hbench/distinfo         |  3 ++-
 benchmarks/hbench/patches/patch-ar | 13 +++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 benchmarks/hbench/patches/patch-ar

(limited to 'benchmarks/hbench')

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 5c89e1165f3..c3eb74cd0b9 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2008/01/19 09:16:18 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2008/04/05 14:09:18 chris Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		benchmarks
 MASTER_SITES=		http://www.eecs.harvard.edu/vino/perf/hbench/
 
diff --git a/benchmarks/hbench/distinfo b/benchmarks/hbench/distinfo
index a6eee2eb847..3479f01a3e1 100644
--- a/benchmarks/hbench/distinfo
+++ b/benchmarks/hbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/01/23 18:07:51 joerg Exp $
+$NetBSD: distinfo,v 1.12 2008/04/05 14:09:18 chris Exp $
 
 SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0
 RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103
@@ -19,3 +19,4 @@ SHA1 (patch-an) = 4cb762c246cdde99a219b8a4de2d354f2b6abb85
 SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
 SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
 SHA1 (patch-aq) = ecab68eae37cba0109225b82c4b18b48cd9f6498
+SHA1 (patch-ar) = 26c8cb68f6d5c8b878e5f600eba579e9cd2fce30
diff --git a/benchmarks/hbench/patches/patch-ar b/benchmarks/hbench/patches/patch-ar
new file mode 100644
index 00000000000..1812cfbdb06
--- /dev/null
+++ b/benchmarks/hbench/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2008/04/05 14:09:18 chris Exp $
+
+--- src/mhz.c.orig	2008-04-05 14:34:31.000000000 +0100
++++ src/mhz.c	2008-04-05 14:33:40.000000000 +0100
+@@ -118,6 +118,8 @@ main(ac, av)
+  */
+ #ifdef sparc
+ #	define	FOUR	a >>= 1; a >>= 1; a >>= 1; a >>= 1;
++#elif defined(__arm__)
++#	define	FOUR	a++; a >>= 1; a++; a >>= 1;
+ #else
+ #	ifdef _AIX	/* really for the rs6000 only */
+ #		define	FOUR	a++; a++;
-- 
cgit v1.2.3