diff -ru GotoBLAS-1.02/getarch.c GotoBLAS/getarch.c --- GotoBLAS-1.02/getarch.c 2006-03-18 17:13:20.000000000 -0700 +++ GotoBLAS/getarch.c 2006-07-09 20:08:45.073759000 -0600 @@ -38,7 +38,7 @@ #undef FORCE_PPC970 #undef FORCE_PPC970MP #undef FORCE_PPC440 -#undef FORCE_PPC440FP2 +#define FORCE_PPC440FP2 #undef FORCE_GENERIC #ifdef FORCE_P2 diff -ru GotoBLAS-1.02/level1/others/memory.c GotoBLAS/level1/others/memory.c --- GotoBLAS-1.02/level1/others/memory.c 2006-03-22 17:05:00.000000000 -0700 +++ GotoBLAS/level1/others/memory.c 2006-07-08 22:47:03.000000000 -0600 @@ -55,7 +55,7 @@ #include #include #include -#include +#include #ifdef USE_MEMORY_AFFINITY #include #endif diff -ru GotoBLAS-1.02/Makefile.rule GotoBLAS/Makefile.rule --- GotoBLAS-1.02/Makefile.rule 2006-07-09 19:59:19.153085000 -0600 +++ GotoBLAS/Makefile.rule 2006-07-09 20:17:39.543853000 -0600 @@ -17,7 +17,7 @@ # F_COMPILER = INTEL # F_COMPILER = PGI # F_COMPILER = PATHSCALE -# F_COMPILER = IBM +F_COMPILER = IBM # F_COMPILER = COMPAQ # F_COMPILER = SUN # F_COMPILER = F2C @@ -51,6 +51,8 @@ # If you want to use memory affinity (for NUMA) # You can't use it with ALLOC_STATIC together # CCOMMON_OPT += -DUSE_MEMORY_AFFINITY +CCOMMON_OPT += -Dlinux +FCOMMON_OPT += -WF,-Dlinux # If you have special compiler to run script to determine architecture. GETARCH_CC = @@ -126,7 +128,7 @@ endif ifeq ($(C_COMPILER), GNU) -COMPILER = gcc +COMPILER = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-gcc CCOMMON_OPT += -Wall ifneq ($(OSNAME), CYGWIN_NT-5.1) CCOMMON_OPT += -fPIC @@ -136,8 +138,8 @@ CCOMMON_OPT += -m64 GETARCH_FLAGS = -m64 else -CCOMMON_OPT += -m32 -GETARCH_FLAGS = -m32 +CCOMMON_OPT += +GETARCH_FLAGS = endif endif COMMON_PROF += -fno-inline @@ -210,9 +212,9 @@ endif ifeq ($(F_COMPILER), IBM) -COMPILER_F77 = xlf +COMPILER_F77 = blrts_xlf BU = -# FCOMMON_OPT += -qarch=440 +FCOMMON_OPT += -O3 -qarch=440 -qtune=440 -qstrict ifdef BINARY64 FCOMMON_OPT += -q64 else diff -ru GotoBLAS-1.02/test/cblat2.f GotoBLAS/test/cblat2.f --- GotoBLAS-1.02/test/cblat2.f 2003-11-01 07:27:38.000000000 -0700 +++ GotoBLAS/test/cblat2.f 2006-07-09 16:02:01.755475000 -0600 @@ -66,7 +66,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 17 ) COMPLEX ZERO, ONE @@ -124,6 +124,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='cblat2.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/cblat3.f GotoBLAS/test/cblat3.f --- GotoBLAS-1.02/test/cblat3.f 2003-11-01 07:27:38.000000000 -0700 +++ GotoBLAS/test/cblat3.f 2006-07-09 19:50:28.147108000 -0600 @@ -48,7 +48,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 9 ) COMPLEX ZERO, ONE @@ -101,6 +101,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='cblat3.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/dblat2.f GotoBLAS/test/dblat2.f --- GotoBLAS-1.02/test/dblat2.f 2003-11-01 07:27:34.000000000 -0700 +++ GotoBLAS/test/dblat2.f 2006-07-09 16:01:28.741873000 -0600 @@ -65,7 +65,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 16 ) DOUBLE PRECISION ZERO, HALF, ONE @@ -119,6 +119,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='dblat2.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/dblat3.f GotoBLAS/test/dblat3.f --- GotoBLAS-1.02/test/dblat3.f 2005-08-17 10:38:12.000000000 -0600 +++ GotoBLAS/test/dblat3.f 2006-07-09 19:50:00.918242000 -0600 @@ -45,7 +45,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 6 ) DOUBLE PRECISION ZERO, HALF, ONE @@ -94,6 +94,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='dblat3.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/Makefile GotoBLAS/test/Makefile --- GotoBLAS-1.02/test/Makefile 2006-02-28 08:35:36.000000000 -0700 +++ GotoBLAS/test/Makefile 2006-07-09 15:37:00.507774000 -0600 @@ -9,22 +9,22 @@ all : level1 level2 level3 level1 : sblat1 dblat1 cblat1 zblat1 - ./sblat1 - ./dblat1 - ./cblat1 - ./zblat1 + cqsub -n 1 -t 5 -O sblat1 ./sblat1 + cqsub -n 1 -t 5 -O dblat1 ./dblat1 + cqsub -n 1 -t 5 -O cblat1 ./cblat1 + cqsub -n 1 -t 5 -O zblat1 ./zblat1 level2 : sblat2 dblat2 cblat2 zblat2 - ./sblat2 < ./sblat2.dat - ./dblat2 < ./dblat2.dat - ./cblat2 < ./cblat2.dat - ./zblat2 < ./zblat2.dat + cqsub -n 1 -t 5 -O sblat2 ./sblat2 < ./sblat2.dat + cqsub -n 1 -t 5 -O dblat2 ./dblat2 < ./dblat2.dat + cqsub -n 1 -t 5 -O cblat2 ./cblat2 < ./cblat2.dat + cqsub -n 1 -t 5 -O zblat2 ./zblat2 < ./zblat2.dat level3 : sblat3 dblat3 cblat3 zblat3 - ./sblat3 < ./sblat3.dat - ./dblat3 < ./dblat3.dat - ./cblat3 < ./cblat3.dat - ./zblat3 < ./zblat3.dat + cqsub -n 1 -t 5 -O sblat3 ./sblat3 < ./sblat3.dat + cqsub -n 1 -t 5 -O dblat3 ./dblat3 < ./dblat3.dat + cqsub -n 1 -t 5 -O cblat3 ./cblat3 < ./cblat3.dat + cqsub -n 1 -t 5 -O zblat3 ./zblat3 < ./zblat3.dat timing : sblas3time dblas3time cblas3time zblas3time diff -ru GotoBLAS-1.02/test/sblat2.f GotoBLAS/test/sblat2.f --- GotoBLAS-1.02/test/sblat2.f 2003-11-01 07:27:35.000000000 -0700 +++ GotoBLAS/test/sblat2.f 2006-07-09 15:54:22.963781000 -0600 @@ -65,7 +65,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 16 ) REAL ZERO, HALF, ONE @@ -119,6 +119,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='sblat2.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/sblat3.f GotoBLAS/test/sblat3.f --- GotoBLAS-1.02/test/sblat3.f 2005-08-17 10:39:48.000000000 -0600 +++ GotoBLAS/test/sblat3.f 2006-07-09 19:49:30.454632000 -0600 @@ -45,7 +45,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 6 ) REAL ZERO, HALF, ONE @@ -94,6 +94,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='sblat3.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/zblat2.f GotoBLAS/test/zblat2.f --- GotoBLAS-1.02/test/zblat2.f 2003-11-01 07:27:36.000000000 -0700 +++ GotoBLAS/test/zblat2.f 2006-07-09 16:02:18.996357000 -0600 @@ -66,7 +66,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 17 ) COMPLEX*16 ZERO, ONE @@ -125,6 +125,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='zblat2.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' ) diff -ru GotoBLAS-1.02/test/zblat3.f GotoBLAS/test/zblat3.f --- GotoBLAS-1.02/test/zblat3.f 2004-06-10 06:21:36.000000000 -0600 +++ GotoBLAS/test/zblat3.f 2006-07-09 19:51:04.476704000 -0600 @@ -48,7 +48,7 @@ * * .. Parameters .. INTEGER NIN - PARAMETER ( NIN = 5 ) + PARAMETER ( NIN = 30 ) INTEGER NSUBS PARAMETER ( NSUBS = 9 ) COMPLEX*16 ZERO, ONE @@ -102,6 +102,7 @@ * * Read name and unit number for summary output file and open file. * + OPEN( UNIT=30, FILE='zblat3.dat', STATUS='OLD' ) READ( NIN, FMT = * )SUMMRY READ( NIN, FMT = * )NOUT OPEN( NOUT, FILE = SUMMRY, STATUS = 'NEW' )