| 1 |
markusle 08/08/03 17:54:19 |
| 2 |
|
| 3 |
Added: blas-atlas-3.9.1-timing.patch |
| 4 |
blas-atlas-3.9.1-Core2Duo-detect.patch |
| 5 |
Log: |
| 6 |
Added patches to fix infinite recursion during bootstrapping and to improve Core2Duo detection (fixes bug #233614). |
| 7 |
(Portage version: 2.2_rc5/cvs/Linux 2.6.26-SENTINEL-1 i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/blas-atlas/files/blas-atlas-3.9.1-timing.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: blas-atlas-3.9.1-timing.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur ATLAS/makes/Make.l1tune ATLAS.new/makes/Make.l1tune |
| 18 |
--- ATLAS/makes/Make.l1tune 2008-07-22 10:32:34.000000000 -0400 |
| 19 |
+++ ATLAS.new/makes/Make.l1tune 2008-08-02 07:17:40.000000000 -0400 |
| 20 |
@@ -46,7 +46,7 @@ |
| 21 |
|
| 22 |
force_build : |
| 23 |
auxlib : |
| 24 |
- cd $(AUXdir) ; make lib |
| 25 |
+# cd $(AUXdir) ; make lib |
| 26 |
$(BINdir)/xsubstr: |
| 27 |
cd $(BINdir) ; $(MAKE) xsubstr |
| 28 |
cdotc.dsc : $(mySRCdir)/DOT/ccasesc.dsc $(BINdir)/xsubstr |
| 29 |
diff -Naur ATLAS/tune/blas/level1/dottime.c ATLAS.new/tune/blas/level1/dottime.c |
| 30 |
--- ATLAS/tune/blas/level1/dottime.c 2008-07-22 10:33:17.000000000 -0400 |
| 31 |
+++ ATLAS.new/tune/blas/level1/dottime.c 2008-08-02 07:20:23.000000000 -0400 |
| 32 |
@@ -198,6 +198,7 @@ |
| 33 |
#define TEST_DOT ATL_DOT |
| 34 |
#endif |
| 35 |
|
| 36 |
+#if 0 |
| 37 |
double DoOneTiming(int N, int nkflop, int cachesize, int incX, int incY) |
| 38 |
/* |
| 39 |
* This method of timing can be used when we have a cycle-accurate timer |
| 40 |
@@ -253,6 +254,8 @@ |
| 41 |
FA_free(Y, FAy, MAy); |
| 42 |
return(t1-t0); |
| 43 |
} |
| 44 |
+#endif |
| 45 |
+ |
| 46 |
double DoTiming(int N, int nkflop, int cachesize, int incX, int incY) |
| 47 |
{ |
| 48 |
#ifdef TREAL |
| 49 |
@@ -322,9 +325,9 @@ |
| 50 |
int i; |
| 51 |
for (i=0; i < nrep; i++) |
| 52 |
{ |
| 53 |
- if (nkflop <= 0) |
| 54 |
- tims[i] = DoOneTiming(N, nkflop, cachesize, incX, incY); |
| 55 |
- else |
| 56 |
+ // if (nkflop <= 0) |
| 57 |
+ // tims[i] = DoOneTiming(N, nkflop, cachesize, incX, incY); |
| 58 |
+ // else |
| 59 |
tims[i] = DoTiming(N, nkflop, cachesize, incX, incY); |
| 60 |
fprintf(stdout, " N=%d, tim=%e\n", N, tims[i]); |
| 61 |
} |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/blas-atlas/files/blas-atlas-3.9.1-Core2Duo-detect.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: blas-atlas-3.9.1-Core2Duo-detect.patch |
| 71 |
=================================================================== |
| 72 |
diff -Naur ATLAS/CONFIG/src/backend/archinfo_x86.c ATLAS.new/CONFIG/src/backend/archinfo_x86.c |
| 73 |
--- ATLAS/CONFIG/src/backend/archinfo_x86.c 2008-07-22 10:32:34.000000000 -0400 |
| 74 |
+++ ATLAS.new/CONFIG/src/backend/archinfo_x86.c 2008-08-02 07:17:09.000000000 -0400 |
| 75 |
@@ -92,11 +92,11 @@ |
| 76 |
*/ |
| 77 |
do_cpuid(r, 1); |
| 78 |
*family = (r[EAX] >> 8) & 0xf; /* base family in bits 11-8 */ |
| 79 |
- if (*family == 0xf || *family == 0) /* extended family is added in */ |
| 80 |
+/* if (*family == 0xf || *family == 0) */ /* extended family is added in */ |
| 81 |
*family += ((r[EAX] >> 20) & 0xff); |
| 82 |
|
| 83 |
*model = (r[0] >> 4) & 0xf; /* model in bits 7-4 */ |
| 84 |
- if (*model == 0xf) /* extended model is concatenated */ |
| 85 |
+ /* if (*model == 0xf) */ /* extended model is concatenated */ |
| 86 |
*model |= ((r[0] >> 12) & 0xf0); |
| 87 |
|
| 88 |
/* |
| 89 |
@@ -294,7 +294,7 @@ |
| 90 |
case 14: |
| 91 |
iret = IntCoreDuo; |
| 92 |
break; |
| 93 |
- case 15: |
| 94 |
+ case 15: ; case 23: |
| 95 |
iret = IntCore2Duo; |
| 96 |
break; |
| 97 |
default: |
Archives