Menu
▾
▴
chasm-interop-cvs — CVS messages for chasm repository.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(80) |
Nov
(95) |
Dec
(73) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1) |
Feb
(33) |
Mar
(13) |
Apr
|
May
|
Jun
(6) |
Jul
(75) |
Aug
(124) |
Sep
(136) |
Oct
(25) |
Nov
(10) |
Dec
|
| 2004 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ras...@us...> - 2004-01-14 23:15:48
|
Update of /cvsroot/chasm-interop/chasm/include/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv32383
Modified Files:
IBMXL_dv.h
Log Message:
Upgraded hidden dope vector to be the same as standard (include flag64 element)
Index: IBMXL_dv.h
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/include/compilers/IBMXL_dv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IBMXL_dv.h 24 Sep 2003 17:52:45 -0000 1.5
--- IBMXL_dv.h 14 Jan 2004 23:15:45 -0000 1.6
***************
*** 49,53 ****
int cookie : 3; /* unknown */
unsigned int zero : 4; /* always 0 */
! unsigned int one : 8; /* always 1 */
#ifdef CHASM_ARCH_64
unsigned int rank; /* number of dimensions */
--- 49,54 ----
int cookie : 3; /* unknown */
unsigned int zero : 4; /* always 0 */
! unsigned int flag64 : 1; /* 1 if 64 bit object files (-q64) */
! unsigned int one : 7; /* always 1 */
#ifdef CHASM_ARCH_64
unsigned int rank; /* number of dimensions */
|
|
From: <ras...@us...> - 2004-01-14 00:00:57
|
Update of /cvsroot/chasm-interop/chasm/example/particle
In directory sc8-pr-cvs1:/tmp/cvs-serv30403
Modified Files:
driver.cc
Log Message:
Fixed Before/After particle move information.
Index: driver.cc
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/example/particle/driver.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** driver.cc 10 Sep 2003 20:38:05 -0000 1.3
--- driver.cc 14 Jan 2004 00:00:54 -0000 1.4
***************
*** 22,26 ****
PARTICLEMOD::PARTICLECREATE(particle, pos, vel);
- PARTICLEMOD::PARTICLEMOVE(particle, tstep);
PARTICLEMOD::PARTICLEPRINT(particle);
--- 22,25 ----
|
|
From: <ras...@us...> - 2004-01-13 23:57:36
|
Update of /cvsroot/chasm-interop/chasm/include In directory sc8-pr-cvs1:/tmp/cvs-serv29573 Modified Files: F90Array.h Log Message: Add /* */ to comment for last #endif Index: F90Array.h =================================================================== RCS file: /cvsroot/chasm-interop/chasm/include/F90Array.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** F90Array.h 11 Sep 2003 15:55:21 -0000 1.9 --- F90Array.h 13 Jan 2004 23:57:33 -0000 1.10 *************** *** 205,207 **** ! #endif _F90ARRAY_H_ --- 205,207 ---- ! #endif /* _F90ARRAY_H_ */ |
|
From: <ras...@us...> - 2004-01-13 21:42:49
|
Update of /cvsroot/chasm-interop/chasm/include In directory sc8-pr-cvs1:/tmp/cvs-serv32610 Modified Files: F90Descriptor.h Log Message: Add /* */ to comment for last #endif Index: F90Descriptor.h =================================================================== RCS file: /cvsroot/chasm-interop/chasm/include/F90Descriptor.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** F90Descriptor.h 11 Sep 2003 15:50:50 -0000 1.1 --- F90Descriptor.h 13 Jan 2004 21:42:46 -0000 1.2 *************** *** 54,56 **** } ! #endif _DESCRIPTOR_H_ --- 54,56 ---- } ! #endif /* _DESCRIPTOR_H_ */ |
|
From: <ras...@us...> - 2003-11-26 21:48:32
|
Update of /cvsroot/chasm-interop/chasm/src/farray/autogen In directory sc8-pr-cvs1:/tmp/cvs-serv7393 Modified Files: F90CopyDesc.c F90CopyDesc.c.xsl Log Message: Fixed warning messages occuring using Intel C. This also fixes a bug report by Tom. Index: F90CopyDesc.c =================================================================== RCS file: /cvsroot/chasm-interop/chasm/src/farray/autogen/F90CopyDesc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** F90CopyDesc.c 2 Sep 2003 21:46:22 -0000 1.8 --- F90CopyDesc.c 26 Nov 2003 21:48:29 -0000 1.9 *************** *** 26,29 **** --- 26,30 ---- #include <CompilerCharacteristics.h> #include <F90CreateArray.h> + #include <stdlib.h> /*-----------------------------------------------------------------------*/ Index: F90CopyDesc.c.xsl =================================================================== RCS file: /cvsroot/chasm-interop/chasm/src/farray/autogen/F90CopyDesc.c.xsl,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** F90CopyDesc.c.xsl 2 Sep 2003 21:46:22 -0000 1.8 --- F90CopyDesc.c.xsl 26 Nov 2003 21:48:29 -0000 1.9 *************** *** 149,152 **** --- 149,153 ---- #include <CompilerCharacteristics.h> #include <F90CreateArray.h> + #include <stdlib.h> </xsl:text> |
|
From: <ras...@us...> - 2003-11-26 21:47:08
|
Update of /cvsroot/chasm-interop/chasm/src/farray In directory sc8-pr-cvs1:/tmp/cvs-serv7184 Modified Files: CompilerCharacteristics.c Log Message: Fixed warning messages occuring using Intel C Index: CompilerCharacteristics.c =================================================================== RCS file: /cvsroot/chasm-interop/chasm/src/farray/CompilerCharacteristics.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CompilerCharacteristics.c 1 Oct 2003 21:15:22 -0000 1.10 --- CompilerCharacteristics.c 26 Nov 2003 21:47:05 -0000 1.11 *************** *** 21,24 **** --- 21,25 ---- #include <compilers/Absoft.h> #include <compilers/Alpha.h> + #include <compilers/Cray.h> #include <compilers/IBMXL.h> #include <compilers/Intel.h> |
|
From: <ras...@us...> - 2003-11-26 21:45:18
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors/autogen
In directory sc8-pr-cvs1:/tmp/cvs-serv6822
Modified Files:
testcreate.c testcreate.c.xsl testverify.c testverify.c.xsl
Log Message:
Fixed warning messages occuring using Intel C
Index: testcreate.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/autogen/testcreate.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testcreate.c 2 Sep 2003 21:51:29 -0000 1.9
--- testcreate.c 26 Nov 2003 21:45:13 -0000 1.10
***************
*** 266,270 ****
# define testArray7DC F90_SYMBOL( testArray7DC )
# define testArray7DDC F90_SYMBOL( testArray7DDC )
! #endif /* F90_SYM_CASE_UPPER */
--- 266,270 ----
# define testArray7DC F90_SYMBOL( testArray7DC )
# define testArray7DDC F90_SYMBOL( testArray7DDC )
! #endif /* F90_SYM_CASE_MIXED */
***************
*** 369,372 ****
--- 369,472 ----
# define testArray7DDC F90_SYMBOL( TESTARRAY7DDC )
#endif /* F90_SYM_CASE_UPPER */
+
+
+ int testArray1DI1(void*);
+ int testArray1DI2(void*);
+ int testArray1DI(void*);
+ int testArray1DI4(void*);
+ int testArray1DI8(void*);
+ int testArray1DL1(void*);
+ int testArray1DL2(void*);
+ int testArray1DL(void*);
+ int testArray1DL4(void*);
+ int testArray1DL8(void*);
+ int testArray1DR(void*);
+ int testArray1DD(void*);
+ int testArray1DC(void*);
+ int testArray1DDC(void*);
+ int testArray2DI1(void*);
+ int testArray2DI2(void*);
+ int testArray2DI(void*);
+ int testArray2DI4(void*);
+ int testArray2DI8(void*);
+ int testArray2DL1(void*);
+ int testArray2DL2(void*);
+ int testArray2DL(void*);
+ int testArray2DL4(void*);
+ int testArray2DL8(void*);
+ int testArray2DR(void*);
+ int testArray2DD(void*);
+ int testArray2DC(void*);
+ int testArray2DDC(void*);
+ int testArray3DI1(void*);
+ int testArray3DI2(void*);
+ int testArray3DI(void*);
+ int testArray3DI4(void*);
+ int testArray3DI8(void*);
+ int testArray3DL1(void*);
+ int testArray3DL2(void*);
+ int testArray3DL(void*);
+ int testArray3DL4(void*);
+ int testArray3DL8(void*);
+ int testArray3DR(void*);
+ int testArray3DD(void*);
+ int testArray3DC(void*);
+ int testArray3DDC(void*);
+ int testArray4DI1(void*);
+ int testArray4DI2(void*);
+ int testArray4DI(void*);
+ int testArray4DI4(void*);
+ int testArray4DI8(void*);
+ int testArray4DL1(void*);
+ int testArray4DL2(void*);
+ int testArray4DL(void*);
+ int testArray4DL4(void*);
+ int testArray4DL8(void*);
+ int testArray4DR(void*);
+ int testArray4DD(void*);
+ int testArray4DC(void*);
+ int testArray4DDC(void*);
+ int testArray5DI1(void*);
+ int testArray5DI2(void*);
+ int testArray5DI(void*);
+ int testArray5DI4(void*);
+ int testArray5DI8(void*);
+ int testArray5DL1(void*);
+ int testArray5DL2(void*);
+ int testArray5DL(void*);
+ int testArray5DL4(void*);
+ int testArray5DL8(void*);
+ int testArray5DR(void*);
+ int testArray5DD(void*);
+ int testArray5DC(void*);
+ int testArray5DDC(void*);
+ int testArray6DI1(void*);
+ int testArray6DI2(void*);
+ int testArray6DI(void*);
+ int testArray6DI4(void*);
+ int testArray6DI8(void*);
+ int testArray6DL1(void*);
+ int testArray6DL2(void*);
+ int testArray6DL(void*);
+ int testArray6DL4(void*);
+ int testArray6DL8(void*);
+ int testArray6DR(void*);
+ int testArray6DD(void*);
+ int testArray6DC(void*);
+ int testArray6DDC(void*);
+ int testArray7DI1(void*);
+ int testArray7DI2(void*);
+ int testArray7DI(void*);
+ int testArray7DI4(void*);
+ int testArray7DI8(void*);
+ int testArray7DL1(void*);
+ int testArray7DL2(void*);
+ int testArray7DL(void*);
+ int testArray7DL4(void*);
+ int testArray7DL8(void*);
+ int testArray7DR(void*);
+ int testArray7DD(void*);
+ int testArray7DC(void*);
+ int testArray7DDC(void*);
Index: testcreate.c.xsl
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/autogen/testcreate.c.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** testcreate.c.xsl 2 Sep 2003 21:51:29 -0000 1.9
--- testcreate.c.xsl 26 Nov 2003 21:45:14 -0000 1.10
***************
*** 73,77 ****
</xsl:for-each>
</xsl:for-each>
! <xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
<xsl:value-of select="concat($newline, $newline, $newline)"/>
--- 73,77 ----
</xsl:for-each>
</xsl:for-each>
! <xsl:text>#endif /* F90_SYM_CASE_MIXED */</xsl:text>
<xsl:value-of select="concat($newline, $newline, $newline)"/>
***************
*** 88,92 ****
</xsl:for-each>
<xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
! <xsl:value-of select="concat($newline, $newline, $newline)"/>
<xsl:for-each select="type">
--- 88,103 ----
</xsl:for-each>
<xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
! <xsl:value-of select="concat($newline, $newline)"/>
!
! <xsl:value-of select="$newline"/>
! <xsl:for-each select="dim">
! <xsl:variable name="rank" select="@rank"/>
! <xsl:for-each select="../type">
! <xsl:text>int testArray</xsl:text>
! <xsl:value-of select="concat($rank, 'D', @name, '(void*);')"/>
! <xsl:value-of select="$newline"/>
! </xsl:for-each>
! </xsl:for-each>
! <xsl:value-of select="concat($newline, $newline)"/>
<xsl:for-each select="type">
Index: testverify.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/autogen/testverify.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testverify.c 2 Sep 2003 21:51:29 -0000 1.6
--- testverify.c 26 Nov 2003 21:45:14 -0000 1.7
***************
*** 266,270 ****
# define testArray7DC F90_SYMBOL( testArray7DC )
# define testArray7DDC F90_SYMBOL( testArray7DDC )
! #endif /* F90_SYM_CASE_UPPER */
--- 266,270 ----
# define testArray7DC F90_SYMBOL( testArray7DC )
# define testArray7DDC F90_SYMBOL( testArray7DDC )
! #endif /* F90_SYM_CASE_MIXED */
***************
*** 369,372 ****
--- 369,472 ----
# define testArray7DDC F90_SYMBOL( TESTARRAY7DDC )
#endif /* F90_SYM_CASE_UPPER */
+
+
+ int testArray1DI1(void*);
+ int testArray1DI2(void*);
+ int testArray1DI(void*);
+ int testArray1DI4(void*);
+ int testArray1DI8(void*);
+ int testArray1DL1(void*);
+ int testArray1DL2(void*);
+ int testArray1DL(void*);
+ int testArray1DL4(void*);
+ int testArray1DL8(void*);
+ int testArray1DR(void*);
+ int testArray1DD(void*);
+ int testArray1DC(void*);
+ int testArray1DDC(void*);
+ int testArray2DI1(void*);
+ int testArray2DI2(void*);
+ int testArray2DI(void*);
+ int testArray2DI4(void*);
+ int testArray2DI8(void*);
+ int testArray2DL1(void*);
+ int testArray2DL2(void*);
+ int testArray2DL(void*);
+ int testArray2DL4(void*);
+ int testArray2DL8(void*);
+ int testArray2DR(void*);
+ int testArray2DD(void*);
+ int testArray2DC(void*);
+ int testArray2DDC(void*);
+ int testArray3DI1(void*);
+ int testArray3DI2(void*);
+ int testArray3DI(void*);
+ int testArray3DI4(void*);
+ int testArray3DI8(void*);
+ int testArray3DL1(void*);
+ int testArray3DL2(void*);
+ int testArray3DL(void*);
+ int testArray3DL4(void*);
+ int testArray3DL8(void*);
+ int testArray3DR(void*);
+ int testArray3DD(void*);
+ int testArray3DC(void*);
+ int testArray3DDC(void*);
+ int testArray4DI1(void*);
+ int testArray4DI2(void*);
+ int testArray4DI(void*);
+ int testArray4DI4(void*);
+ int testArray4DI8(void*);
+ int testArray4DL1(void*);
+ int testArray4DL2(void*);
+ int testArray4DL(void*);
+ int testArray4DL4(void*);
+ int testArray4DL8(void*);
+ int testArray4DR(void*);
+ int testArray4DD(void*);
+ int testArray4DC(void*);
+ int testArray4DDC(void*);
+ int testArray5DI1(void*);
+ int testArray5DI2(void*);
+ int testArray5DI(void*);
+ int testArray5DI4(void*);
+ int testArray5DI8(void*);
+ int testArray5DL1(void*);
+ int testArray5DL2(void*);
+ int testArray5DL(void*);
+ int testArray5DL4(void*);
+ int testArray5DL8(void*);
+ int testArray5DR(void*);
+ int testArray5DD(void*);
+ int testArray5DC(void*);
+ int testArray5DDC(void*);
+ int testArray6DI1(void*);
+ int testArray6DI2(void*);
+ int testArray6DI(void*);
+ int testArray6DI4(void*);
+ int testArray6DI8(void*);
+ int testArray6DL1(void*);
+ int testArray6DL2(void*);
+ int testArray6DL(void*);
+ int testArray6DL4(void*);
+ int testArray6DL8(void*);
+ int testArray6DR(void*);
+ int testArray6DD(void*);
+ int testArray6DC(void*);
+ int testArray6DDC(void*);
+ int testArray7DI1(void*);
+ int testArray7DI2(void*);
+ int testArray7DI(void*);
+ int testArray7DI4(void*);
+ int testArray7DI8(void*);
+ int testArray7DL1(void*);
+ int testArray7DL2(void*);
+ int testArray7DL(void*);
+ int testArray7DL4(void*);
+ int testArray7DL8(void*);
+ int testArray7DR(void*);
+ int testArray7DD(void*);
+ int testArray7DC(void*);
+ int testArray7DDC(void*);
Index: testverify.c.xsl
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/autogen/testverify.c.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** testverify.c.xsl 2 Sep 2003 21:51:29 -0000 1.6
--- testverify.c.xsl 26 Nov 2003 21:45:14 -0000 1.7
***************
*** 73,77 ****
</xsl:for-each>
</xsl:for-each>
! <xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
<xsl:value-of select="concat($newline, $newline, $newline)"/>
--- 73,77 ----
</xsl:for-each>
</xsl:for-each>
! <xsl:text>#endif /* F90_SYM_CASE_MIXED */</xsl:text>
<xsl:value-of select="concat($newline, $newline, $newline)"/>
***************
*** 88,92 ****
</xsl:for-each>
<xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
! <xsl:value-of select="concat($newline, $newline, $newline)"/>
<xsl:for-each select="type">
--- 88,103 ----
</xsl:for-each>
<xsl:text>#endif /* F90_SYM_CASE_UPPER */</xsl:text>
! <xsl:value-of select="concat($newline, $newline)"/>
!
! <xsl:value-of select="$newline"/>
! <xsl:for-each select="dim">
! <xsl:variable name="rank" select="@rank"/>
! <xsl:for-each select="../type">
! <xsl:text>int testArray</xsl:text>
! <xsl:value-of select="concat($rank, 'D', @name, '(void*);')"/>
! <xsl:value-of select="$newline"/>
! </xsl:for-each>
! </xsl:for-each>
! <xsl:value-of select="concat($newline, $newline)"/>
<xsl:for-each select="type">
|
|
From: <ras...@us...> - 2003-11-26 21:42:51
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv6194
Modified Files:
testdesc.c
Log Message:
Fixed warning occuring using Intel C
Index: testdesc.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/testdesc.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** testdesc.c 14 Nov 2003 20:28:41 -0000 1.37
--- testdesc.c 26 Nov 2003 21:42:47 -0000 1.38
***************
*** 4,7 ****
--- 4,8 ----
#include <stdio.h>
#include <stdlib.h>
+ #include <string.h>
typedef struct Particle {
***************
*** 406,409 ****
--- 407,413 ----
void send_lla1d();
void send_l1a1d();
+ void send_l2a1d();
+ void send_l4a1d();
+ void send_l8a1d();
void send_i1a1d();
void send_i2a1d();
***************
*** 434,437 ****
--- 438,447 ----
void send_ia1d_print(int*, int*);
+
+ void send_i1a1d_print(int*, int*);
+ void send_i2a1d_print(int*, int*);
+ void send_i4a1d_print(int*, int*);
+ void send_i8a1d_print(int*, int*);
+
void print_iia1d_null();
void print_ia1d();
|
|
From: <ras...@us...> - 2003-11-26 21:38:58
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors In directory sc8-pr-cvs1:/tmp/cvs-serv5443 Modified Files: test_symbols.c Log Message: Fixed warning occuring using Intel C Index: test_symbols.c =================================================================== RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/test_symbols.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** test_symbols.c 17 Oct 2003 18:42:23 -0000 1.10 --- test_symbols.c 26 Nov 2003 21:38:55 -0000 1.11 *************** *** 20,23 **** --- 20,24 ---- #include "CompilerCharacteristics.h" #include <F90Compiler.h> + #include <string.h> #include <stdio.h> |
|
From: <ras...@us...> - 2003-11-26 21:38:04
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv5273
Modified Files:
array_pointer_size.c
Log Message:
Fixed warning occuring using Intel C
Index: array_pointer_size.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/array_pointer_size.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** array_pointer_size.c 18 Jul 2003 01:27:50 -0000 1.4
--- array_pointer_size.c 26 Nov 2003 21:38:01 -0000 1.5
***************
*** 59,63 ****
if (len != getArrayDescSize(1)) {
printf("FAILED, descriptor size for array1D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array1D pointer length of %d bytes\n",
--- 59,63 ----
if (len != getArrayDescSize(1)) {
printf("FAILED, descriptor size for array1D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array1D pointer length of %d bytes\n",
***************
*** 78,82 ****
if (len != getArrayDescSize(2)) {
printf("FAILED, descriptor size for array2D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array2D pointer length of %d bytes\n",
--- 78,82 ----
if (len != getArrayDescSize(2)) {
printf("FAILED, descriptor size for array2D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array2D pointer length of %d bytes\n",
***************
*** 97,101 ****
if (len != getArrayDescSize(3)) {
printf("FAILED, descriptor size for array3D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array3D pointer length of %d bytes\n",
--- 97,101 ----
if (len != getArrayDescSize(3)) {
printf("FAILED, descriptor size for array3D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array3D pointer length of %d bytes\n",
***************
*** 116,120 ****
if (len != getArrayDescSize(4)) {
printf("FAILED, descriptor size for array4D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array4D pointer length of %d bytes\n",
--- 116,120 ----
if (len != getArrayDescSize(4)) {
printf("FAILED, descriptor size for array4D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array4D pointer length of %d bytes\n",
***************
*** 135,139 ****
if (len != getArrayDescSize(5)) {
printf("FAILED, descriptor size for array5D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array5D pointer length of %d bytes\n",
--- 135,139 ----
if (len != getArrayDescSize(5)) {
printf("FAILED, descriptor size for array5D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array5D pointer length of %d bytes\n",
***************
*** 154,158 ****
if (len != getArrayDescSize(6)) {
printf("FAILED, descriptor size for array6D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array6D pointer length of %d bytes\n",
--- 154,158 ----
if (len != getArrayDescSize(6)) {
printf("FAILED, descriptor size for array6D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array6D pointer length of %d bytes\n",
***************
*** 173,177 ****
if (len != getArrayDescSize(7)) {
printf("FAILED, descriptor size for array7D is incorrect = %d\n", len);
! exit(1);
}
printf("SUCCESSFULLY found Fortran array7D pointer length of %d bytes\n",
--- 173,177 ----
if (len != getArrayDescSize(7)) {
printf("FAILED, descriptor size for array7D is incorrect = %d\n", len);
! return 1;
}
printf("SUCCESSFULLY found Fortran array7D pointer length of %d bytes\n",
***************
*** 180,185 ****
}
}
! if (i == 512) printf("FAILED to find end flag for array7D\n");
!
return 0;
--- 180,187 ----
}
}
! if (i == 512) {
! printf("FAILED to find end flag for array7D\n");
! return 1;
! }
return 0;
|
|
From: <ras...@us...> - 2003-11-14 22:04:18
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv5510
Modified Files:
SUNWspro.c
Log Message:
Fixed bug reported by Tom that returned an error in setArrayDesc if an array lower bound is 0.
Index: SUNWspro.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/SUNWspro.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** SUNWspro.c 21 Oct 2003 21:40:15 -0000 1.26
--- SUNWspro.c 14 Nov 2003 20:24:24 -0000 1.27
***************
*** 199,204 ****
for (i = 0; i < rank; i++) {
! if (dim_extent[i] == 0) return 1;
! if (lower_bound[i] == 0) return 1;
if (stride_mult[i] == 0) return 1;
offset += lower_bound[i] * stride_mult[i];
--- 199,203 ----
for (i = 0; i < rank; i++) {
! if (dim_extent[i] == 0) return 1;
if (stride_mult[i] == 0) return 1;
offset += lower_bound[i] * stride_mult[i];
|
|
From: <ras...@us...> - 2003-11-05 05:03:32
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv2160
Modified Files:
test_ga.f90
Log Message:
Changed to pass 1D shape array to C.
Index: test_ga.f90
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/test_ga.f90,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** test_ga.f90 13 Aug 2003 22:31:09 -0000 1.3
--- test_ga.f90 5 Nov 2003 05:03:28 -0000 1.4
***************
*** 2,8 ****
implicit none
interface
! subroutine create_ga(a, nx, ny, error)
integer, pointer :: a(:,:)
! integer, intent(in) :: nx, ny
integer, intent(out) :: error
end subroutine create_ga
--- 2,8 ----
implicit none
interface
! subroutine create_ga(a, ashape, error)
integer, pointer :: a(:,:)
! integer, intent(in) :: ashape(2)
integer, intent(out) :: error
end subroutine create_ga
***************
*** 20,24 ****
nx = 9
ny = 5
! call create_ga(a, nx, ny, rc)
if (rc .ne. 0) then
--- 20,28 ----
nx = 9
ny = 5
! ashape(1) = nx
! ashape(2) = ny
! call create_ga(a, ashape, rc)
! ashape(1) = 0
! ashape(2) = 0
if (rc .ne. 0) then
|
|
From: <ras...@us...> - 2003-11-03 23:00:58
|
Update of /cvsroot/chasm-interop/chasm/include In directory sc8-pr-cvs1:/tmp/cvs-serv28072 Modified Files: F90Compiler.h.in Log Message: Added F90_MIN_ELEMENT_SIZE Index: F90Compiler.h.in =================================================================== RCS file: /cvsroot/chasm-interop/chasm/include/F90Compiler.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** F90Compiler.h.in 11 Sep 2003 16:03:42 -0000 1.11 --- F90Compiler.h.in 3 Nov 2003 23:00:55 -0000 1.12 *************** *** 30,38 **** #define F90_MAIN @CHASM_F90_MAIN@ @F90_SYM_CASE_DEFINE@ @F90_SYM_UNDERSCORE_DEFINE@ ! @CHASM_ARCH_DEFINE@ ! @CHASM_ARCH_64_DEFINE@ /* --- 30,40 ---- #define F90_MAIN @CHASM_F90_MAIN@ + @CHASM_ARCH_DEFINE@ + @CHASM_ARCH_64_DEFINE@ + @F90_SYM_CASE_DEFINE@ @F90_SYM_UNDERSCORE_DEFINE@ ! @F90_MIN_ELEMENT_SIZE_DEFINE@ /* |
|
From: <ras...@us...> - 2003-11-03 23:00:31
|
Update of /cvsroot/chasm-interop/chasm
In directory sc8-pr-cvs1:/tmp/cvs-serv27929
Modified Files:
configure.in configure
Log Message:
Added F90_MIN_ELEMENT_SIZE
Index: configure.in
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/configure.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** configure.in 17 Oct 2003 17:43:58 -0000 1.40
--- configure.in 3 Nov 2003 23:00:22 -0000 1.41
***************
*** 76,79 ****
--- 76,80 ----
F90_SYM_CASE_DEFINE=""
F90_SYM_UNDERSCORE_DEFINE=""
+ F90_MIN_ELEMENT_SIZE_DEFINE="#define F90_MIN_ELEMENT_SIZE 1"
host_frag=unknown
***************
*** 214,217 ****
--- 215,219 ----
elif test "$CHASM_ARCH" = "cray" ; then
CHASM_ARCH_DEFINE="#define CHASM_ARCH_CRAY"
+ F90_MIN_ELEMENT_SIZE_DEFINE="#define F90_MIN_ELEMENT_SIZE 4"
elif test "$CHASM_ARCH" = "sgin32" ; then
CHASM_ARCH_DEFINE="#define CHASM_ARCH_SGIN32"
***************
*** 781,784 ****
--- 783,787 ----
AC_SUBST(F90_SYM_CASE_DEFINE)
AC_SUBST(F90_SYM_UNDERSCORE_DEFINE)
+ AC_SUBST(F90_MIN_ELEMENT_SIZE_DEFINE)
AC_SUBST(CHASM_CC)
***************
*** 824,827 ****
--- 827,831 ----
echo "setting F90_SYM_CASE_DEFINE = $F90_SYM_CASE_DEFINE"
echo "setting F90_SYM_UNDERSCORE_DEFINE = $F90_SYM_UNDERSCORE_DEFINE"
+ echo "setting F90_MIN_ELEMENT_SIZE_DEFINE = $F90_MIN_ELEMENT_SIZE_DEFINE"
echo "setting CHASM_F90_COMP_LIBS = $CHASM_F90_COMP_LIBS"
echo "setting CHASM_F90_SOURCES = $CHASM_F90_SOURCES"
Index: configure
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/configure,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure 17 Oct 2003 17:43:58 -0000 1.28
--- configure 3 Nov 2003 23:00:23 -0000 1.29
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.39 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.54.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.40 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.54.
***************
*** 270,274 ****
ac_unique_file="configuration"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os F90 F90FLAGS LDFLAGS ac_ct_F90 EXEEXT OBJEXT F90MAIN F90LIBS CC CFLAGS CPPFLAGS ac_ct_CC target target_cpu target_vendor target_os SUPPORT_FORTRAN90_TRUE SUPPORT_FORTRAN90_FALSE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CHASM_ROOT CHASM_ARCH CHASM_ARCH_DEFINE CHASM_ARCH_64_DEFINE CHASM_ARCH_64_FLAG CHASM_BUILD_USER CHASM_BUILD_HOST CHASM_BUILD_DATE CHASM_VERSION CHASM_NAME CHASM_INSTALL CHASM_INSTALL_TARGETS CHASM_INCLUDE CHASM_LIBS CHASM_BIN CHASM_F90 CHASM_F90_MAIN CHASM_F90FLAGS CHASM_F90MFLAG CHASM_F90CMAINFLAGS CHASM_F90_COMP_LIBS CHASM_F90_SOURCES CHASM_F90_OBJECTS CHASM_COMPILER_INFO CHASM_FORTRAN_COMPILER CHASM_FORTRAN_COMPILER_DEFINE F90_SYM_CASE_DEFINE F90_SYM_UNDERSCORE_DEFINE CHASM_CC CHASM_CXX CHASM_CPPFLAGS CHASM_CXXFLAGS CHASM_AR CHASM_ARFLAGS CHASM_RANLIB CHASM_DEFS host_frag subdirs srcdirs testdirs CXXLIBFLAGS CXXEXEFLAGS PTUSED DY_LDFLAGS PDT_ROOT XALAN_ROOT LIBOBJS LTLIBOBJS'
ac_subst_files=''
--- 270,274 ----
ac_unique_file="configuration"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os F90 F90FLAGS LDFLAGS ac_ct_F90 EXEEXT OBJEXT F90MAIN F90LIBS CC CFLAGS CPPFLAGS ac_ct_CC target target_cpu target_vendor target_os SUPPORT_FORTRAN90_TRUE SUPPORT_FORTRAN90_FALSE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CHASM_ROOT CHASM_ARCH CHASM_ARCH_DEFINE CHASM_ARCH_64_DEFINE CHASM_ARCH_64_FLAG CHASM_BUILD_USER CHASM_BUILD_HOST CHASM_BUILD_DATE CHASM_VERSION CHASM_NAME CHASM_INSTALL CHASM_INSTALL_TARGETS CHASM_INCLUDE CHASM_LIBS CHASM_BIN CHASM_F90 CHASM_F90_MAIN CHASM_F90FLAGS CHASM_F90MFLAG CHASM_F90CMAINFLAGS CHASM_F90_COMP_LIBS CHASM_F90_SOURCES CHASM_F90_OBJECTS CHASM_COMPILER_INFO CHASM_FORTRAN_COMPILER CHASM_FORTRAN_COMPILER_DEFINE F90_SYM_CASE_DEFINE F90_SYM_UNDERSCORE_DEFINE F90_MIN_ELEMENT_SIZE_DEFINE CHASM_CC CHASM_CXX CHASM_CPPFLAGS CHASM_CXXFLAGS CHASM_AR CHASM_ARFLAGS CHASM_RANLIB CHASM_DEFS host_frag subdirs srcdirs testdirs CXXLIBFLAGS CXXEXEFLAGS PTUSED DY_LDFLAGS PDT_ROOT XALAN_ROOT LIBOBJS LTLIBOBJS'
ac_subst_files=''
***************
*** 1298,1301 ****
--- 1298,1302 ----
F90_SYM_CASE_DEFINE=""
F90_SYM_UNDERSCORE_DEFINE=""
+ F90_MIN_ELEMENT_SIZE_DEFINE="#define F90_MIN_ELEMENT_SIZE 1"
host_frag=unknown
***************
*** 1529,1532 ****
--- 1530,1534 ----
elif test "$CHASM_ARCH" = "cray" ; then
CHASM_ARCH_DEFINE="#define CHASM_ARCH_CRAY"
+ F90_MIN_ELEMENT_SIZE_DEFINE="#define F90_MIN_ELEMENT_SIZE 4"
elif test "$CHASM_ARCH" = "sgin32" ; then
CHASM_ARCH_DEFINE="#define CHASM_ARCH_SGIN32"
***************
*** 2655,2659 ****
# LLNL: Added to be consistent with F77
# Provide some information about the compiler.
! echo "$as_me:2657:" \
"checking for Fortran 90 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
--- 2657,2661 ----
# LLNL: Added to be consistent with F77
# Provide some information about the compiler.
! echo "$as_me:2659:" \
"checking for Fortran 90 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
***************
*** 2982,2986 ****
ac_save_F90FLAGS=$F90FLAGS
F90FLAGS="$F90FLAGS $ac_verb"
! (eval echo $as_me:2984: \"$ac_link\") >&5
ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f90_v_output" >&5
--- 2984,2988 ----
ac_save_F90FLAGS=$F90FLAGS
F90FLAGS="$F90FLAGS $ac_verb"
! (eval echo $as_me:2986: \"$ac_link\") >&5
ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f90_v_output" >&5
***************
*** 3056,3060 ****
ac_save_F90FLAGS=$F90FLAGS
F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
! (eval echo $as_me:3058: \"$ac_link\") >&5
ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f90_v_output" >&5
--- 3058,3062 ----
ac_save_F90FLAGS=$F90FLAGS
F90FLAGS="$F90FLAGS $ac_cv_prog_f90_v"
! (eval echo $as_me:3060: \"$ac_link\") >&5
ac_f90_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_f90_v_output" >&5
***************
*** 4699,4702 ****
--- 4701,4705 ----
+
# ---------------------------------------------------------------------------
# Inform users of settings
***************
*** 4717,4720 ****
--- 4720,4724 ----
echo "setting F90_SYM_CASE_DEFINE = $F90_SYM_CASE_DEFINE"
echo "setting F90_SYM_UNDERSCORE_DEFINE = $F90_SYM_UNDERSCORE_DEFINE"
+ echo "setting F90_MIN_ELEMENT_SIZE_DEFINE = $F90_MIN_ELEMENT_SIZE_DEFINE"
echo "setting CHASM_F90_COMP_LIBS = $CHASM_F90_COMP_LIBS"
echo "setting CHASM_F90_SOURCES = $CHASM_F90_SOURCES"
***************
*** 5422,5425 ****
--- 5426,5430 ----
s,@F90_SYM_CASE_DEFINE@,$F90_SYM_CASE_DEFINE,;t t
s,@F90_SYM_UNDERSCORE_DEFINE@,$F90_SYM_UNDERSCORE_DEFINE,;t t
+ s,@F90_MIN_ELEMENT_SIZE_DEFINE@,$F90_MIN_ELEMENT_SIZE_DEFINE,;t t
s,@CHASM_CC@,$CHASM_CC,;t t
s,@CHASM_CXX@,$CHASM_CXX,;t t
|
|
From: <ras...@us...> - 2003-10-30 22:30:16
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv6419
Modified Files:
test_types.c
Log Message:
Modified for F90_MIN_ELEMENT_SIZE on Cray.
Index: test_types.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/test_types.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** test_types.c 6 Sep 2003 23:48:07 -0000 1.9
--- test_types.c 30 Oct 2003 22:30:13 -0000 1.10
***************
*** 65,72 ****
--- 65,77 ----
void *desc, *dv, *dv_hidden;
int i, rank, rc;
+ #if F90_MIN_ELEMENT_SIZE == 4
+ int sa[10];
+ #else
short sa[10];
+ #endif
int ia[10];
long la[10];
long lb[7], stride[7];
+ unsigned long elem_size;
unsigned long extent[7];
***************
*** 89,95 ****
/* create short array descriptor */
! stride[0] = sizeof(short);
rc = cc.setArrayDesc(desc, sa, rank, F90_Array,
! F90_Integer2, sizeof(short), lb, extent, stride);
if (rc) {
fprintf(stderr, "ERROR in setting array descriptor\n");
--- 94,102 ----
/* create short array descriptor */
! elem_size = sizeof(short);
! if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
! stride[0] = elem_size;
rc = cc.setArrayDesc(desc, sa, rank, F90_Array,
! F90_Integer2, elem_size, lb, extent, stride);
if (rc) {
fprintf(stderr, "ERROR in setting array descriptor\n");
***************
*** 153,159 ****
/* create int array descriptor */
! stride[0] = sizeof(int);
rc = cc.setArrayDesc(desc, ia, rank, F90_Array,
! F90_Integer, sizeof(int), lb, extent, stride);
if (rc) {
fprintf(stderr, "ERROR in setting array descriptor\n");
--- 160,167 ----
/* create int array descriptor */
! elem_size = sizeof(int);
! stride[0] = elem_size;
rc = cc.setArrayDesc(desc, ia, rank, F90_Array,
! F90_Integer, elem_size, lb, extent, stride);
if (rc) {
fprintf(stderr, "ERROR in setting array descriptor\n");
***************
*** 217,227 ****
/* create long array descriptor */
! stride[0] = sizeof(long);
! if (sizeof(long) == 4) {
rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! F90_Integer4, sizeof(long), lb, extent, stride);
! } else if (sizeof(long) == 8) {
rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! F90_Integer8, sizeof(long), lb, extent, stride);
} else {
fprintf(stderr, "ERROR, sizeof(long) neither 4 nor 8\n");
--- 225,236 ----
/* create long array descriptor */
! elem_size = sizeof(int);
! stride[0] = elem_size;
! if (elem_size == 4) {
rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! F90_Integer4, elem_size, lb, extent, stride);
! } else if (elem_size == 8) {
rc = cc.setArrayDesc(desc, la, rank, F90_Array,
! F90_Integer8, elem_size, lb, extent, stride);
} else {
fprintf(stderr, "ERROR, sizeof(long) neither 4 nor 8\n");
|
|
From: <ras...@us...> - 2003-10-30 22:08:29
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv1514
Modified Files:
Cray.c
Log Message:
Fixed getMangledName: added _ to end of function.
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Cray.c 30 Oct 2003 21:51:53 -0000 1.16
--- Cray.c 30 Oct 2003 22:08:26 -0000 1.17
***************
*** 531,534 ****
--- 531,536 ----
strcpy(name + funsize + 1, mod_name);
strcpy(name + funsize + 1 + modsize, "_");
+ } else {
+ strcpy(name + funsize, "_");
}
|
|
From: <ras...@us...> - 2003-10-30 21:51:57
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv29769
Modified Files:
Cray.c
Log Message:
Fixed stupid oversite in getArrayStride...
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Cray.c 30 Oct 2003 21:24:30 -0000 1.15
--- Cray.c 30 Oct 2003 21:51:53 -0000 1.16
***************
*** 416,420 ****
if (rank < 1 || rank > dv->rank) return 0;
! if (dv->max_len < 32) {
return dv->dim[dim-1].stride_mult * 4L;
} else {
--- 416,420 ----
if (rank < 1 || rank > dv->rank) return 0;
! if (dv->max_len < 64) {
return dv->dim[dim-1].stride_mult * 4L;
} else {
|
|
From: <ras...@us...> - 2003-10-30 21:24:34
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv24004
Modified Files:
Cray.c
Log Message:
Fixed strides.
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Cray.c 30 Oct 2003 16:59:12 -0000 1.14
--- Cray.c 30 Oct 2003 21:24:30 -0000 1.15
***************
*** 97,105 ****
dv->kind_value = 0;
! if (dv->elem_size <= 32) {
! dv->unused_1 = 36;
! } else {
! dv->unused_1 = 40;
! }
dv->unused_2 = 0;
--- 97,102 ----
dv->kind_value = 0;
! if (dv->elem_size < 64) dv->unused_1 = 36;
! else dv->unused_1 = 40;
dv->unused_2 = 0;
***************
*** 230,237 ****
dv->dim[i].lower_bound = lowerBound[i];
dv->dim[i].extent = extent[i];
! if (dv->max_len < 32) {
! dv->dim[i].stride_mult = strideMult[i];
} else {
! dv->dim[i].stride_mult = strideMult[i]/4;
}
}
--- 227,234 ----
dv->dim[i].lower_bound = lowerBound[i];
dv->dim[i].extent = extent[i];
! if (dv->max_len < 64) {
! dv->dim[i].stride_mult = strideMult[i]/4L;
} else {
! dv->dim[i].stride_mult = strideMult[i]/8L;
}
}
***************
*** 420,426 ****
if (dv->max_len < 32) {
- return dv->dim[dim-1].stride_mult;
- } else {
return dv->dim[dim-1].stride_mult * 4L;
}
}
--- 417,423 ----
if (dv->max_len < 32) {
return dv->dim[dim-1].stride_mult * 4L;
+ } else {
+ return dv->dim[dim-1].stride_mult * 8L;
}
}
|
|
From: <ras...@us...> - 2003-10-30 20:46:58
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv15446
Modified Files:
testdesc.c
Log Message:
Changed array element cast if F90_MIN_ELEMENT_SIZE == 4
Index: testdesc.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/testdesc.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** testdesc.c 30 Oct 2003 17:26:54 -0000 1.35
--- testdesc.c 30 Oct 2003 20:46:55 -0000 1.36
***************
*** 1205,1209 ****
--- 1205,1213 ----
addr = cc.getArrayBaseAddress(dv_ia1d, rank);
for (i = 0; i < 10; i++) {
+ #if F90_MIN_ELEMENT_SIZE == 4
+ int* a = (int*) addr;
+ #else
char* a = (char*) addr;
+ #endif
if (a[i] != i+1) {
fprintf(stderr, "Value error for i1a1d(%d) = %d\n", i+1, a[i]);
***************
*** 1241,1245 ****
--- 1245,1253 ----
addr = cc.getArrayBaseAddress(dv_ia1d, rank);
for (i = 0; i < 10; i++) {
+ #if F90_MIN_ELEMENT_SIZE == 4
+ int* a = (int*) addr;
+ #else
short* a = (short*) addr;
+ #endif
if (a[i] != i+1) {
fprintf(stderr, "Value error for i2a1d(%d) = %d\n", i+1, a[i]);
|
|
From: <ras...@us...> - 2003-10-30 17:26:57
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv2741
Modified Files:
testdesc.c
Log Message:
Forced a minimum element size for Cray compiler, F90_MIN_ELEMENT_SIZE
Index: testdesc.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/testdesc.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** testdesc.c 30 Oct 2003 16:35:33 -0000 1.34
--- testdesc.c 30 Oct 2003 17:26:54 -0000 1.35
***************
*** 808,811 ****
--- 808,812 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 826,829 ****
--- 827,831 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 844,847 ****
--- 846,850 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 862,865 ****
--- 865,869 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 880,883 ****
--- 884,888 ----
addr = cc.getArrayBaseAddress(dv_la0d, rank);
elem_size = sizeof(unsigned long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 898,901 ****
--- 903,907 ----
addr = cc.getArrayBaseAddress(dv_ia0d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 916,919 ****
--- 922,926 ----
addr = cc.getArrayBaseAddress(dv_ra0d, rank);
elem_size = sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 934,937 ****
--- 941,945 ----
addr = cc.getArrayBaseAddress(dv_da0d, rank);
elem_size = sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank,
***************
*** 952,955 ****
--- 960,964 ----
addr = cc.getArrayBaseAddress(dv_ca0d, rank);
elem_size = 2*sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 970,973 ****
--- 979,983 ----
addr = cc.getArrayBaseAddress(dv_dca0d, rank);
elem_size = 2*sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 992,995 ****
--- 1002,1006 ----
elem_size = sizeof(Particle);
#endif
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
rc = cc.setArrayDesc(dv, addr, rank, F90_Pointer,
***************
*** 1019,1022 ****
--- 1030,1034 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1047,1050 ****
--- 1059,1063 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1075,1078 ****
--- 1088,1092 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1103,1106 ****
--- 1117,1121 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1132,1135 ****
--- 1147,1151 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1160,1163 ****
--- 1176,1180 ----
addr = cc.getArrayBaseAddress(dv_la1d, rank);
elem_size = sizeof(unsigned long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1195,1198 ****
--- 1212,1216 ----
}
elem_size = sizeof(char);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1230,1233 ****
--- 1248,1252 ----
}
elem_size = sizeof(short);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1265,1268 ****
--- 1284,1288 ----
}
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1300,1303 ****
--- 1320,1324 ----
}
elem_size = sizeof(long long);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1328,1331 ****
--- 1349,1353 ----
addr = cc.getArrayBaseAddress(dv_ra1d, rank);
elem_size = sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1356,1359 ****
--- 1378,1382 ----
addr = cc.getArrayBaseAddress(dv_da1d, rank);
elem_size = sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1384,1387 ****
--- 1407,1411 ----
addr = cc.getArrayBaseAddress(dv_ca1d, rank);
elem_size = 2*sizeof(float);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1412,1415 ****
--- 1436,1440 ----
addr = cc.getArrayBaseAddress(dv_dca1d, rank);
elem_size = 2*sizeof(double);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1444,1447 ****
--- 1469,1473 ----
elem_size = sizeof(Particle);
#endif
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1473,1476 ****
--- 1499,1503 ----
addr = cc.getArrayBaseAddress(dv_upa1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1507,1510 ****
--- 1534,1538 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
for (i = 0; i < rank; i++) {
***************
*** 1536,1539 ****
--- 1564,1568 ----
addr = cc.getArrayBaseAddress(dv_iia2d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1567,1570 ****
--- 1596,1600 ----
addr = cc.getArrayBaseAddress(dv_iia3d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1598,1601 ****
--- 1628,1632 ----
addr = cc.getArrayBaseAddress(dv_iia4d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1629,1632 ****
--- 1660,1664 ----
addr = cc.getArrayBaseAddress(dv_iia5d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1660,1663 ****
--- 1692,1696 ----
addr = cc.getArrayBaseAddress(dv_iia6d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1691,1694 ****
--- 1724,1728 ----
addr = cc.getArrayBaseAddress(dv_iia7d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
dv = (dope_vec*) malloc( cc.getArrayDescSize(rank) );
calc_stride = elem_size;
***************
*** 1744,1747 ****
--- 1778,1782 ----
addr = cc.getArrayBaseAddress(dv_iia1d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
for (i = 0; i < rank; i++) {
***************
*** 1771,1774 ****
--- 1806,1810 ----
addr = cc.getArrayBaseAddress(dv_iia2d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1802,1805 ****
--- 1838,1842 ----
addr = cc.getArrayBaseAddress(dv_iia3d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1833,1836 ****
--- 1870,1874 ----
addr = cc.getArrayBaseAddress(dv_iia4d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1864,1867 ****
--- 1902,1906 ----
addr = cc.getArrayBaseAddress(dv_iia5d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1895,1898 ****
--- 1934,1938 ----
addr = cc.getArrayBaseAddress(dv_iia6d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
***************
*** 1926,1929 ****
--- 1966,1970 ----
addr = cc.getArrayBaseAddress(dv_iia7d, rank);
elem_size = sizeof(int);
+ if (elem_size < F90_MIN_ELEMENT_SIZE) elem_size = F90_MIN_ELEMENT_SIZE;
extent0 = 1;
stride0 = elem_size;
|
|
From: <ras...@us...> - 2003-10-30 16:59:36
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv29830
Modified Files:
Cray.c
Log Message:
Made elem_size at least 32 bits.
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Cray.c 30 Oct 2003 16:47:46 -0000 1.13
--- Cray.c 30 Oct 2003 16:59:12 -0000 1.14
***************
*** 81,87 ****
dv->rank = rank;
dv->elem_size = 8 * element_size;
- dv->max_len = 8 * element_size;
dv->assoc = 1;
dv->ptr_alloc = 0;
--- 81,89 ----
dv->rank = rank;
+
dv->elem_size = 8 * element_size;
+ if (dv->elem_size < 32) dv->elem_size = 32;
+ dv->max_len = dv->elem_size;
dv->assoc = 1;
dv->ptr_alloc = 0;
|
|
From: <ras...@us...> - 2003-10-30 16:47:49
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv27737
Modified Files:
Cray.c
Log Message:
Fixed printing of unused and working on correct setting of unused.
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Cray.c 29 Oct 2003 16:07:53 -0000 1.12
--- Cray.c 30 Oct 2003 16:47:46 -0000 1.13
***************
*** 95,99 ****
dv->kind_value = 0;
! dv->unused_1 = 36; /* 40 for D1D */
dv->unused_2 = 0;
dv->unused_3 = 0;
--- 95,104 ----
dv->kind_value = 0;
! if (dv->elem_size <= 32) {
! dv->unused_1 = 36;
! } else {
! dv->unused_1 = 40;
! }
!
dv->unused_2 = 0;
dv->unused_3 = 0;
***************
*** 569,574 ****
printf(" unused_2 = %ld\n", dv->unused_2);
printf(" unused_3 = %ld\n", dv->unused_3);
! printf(" unused_4 = %d\n" , dv->unused_1);
! printf(" unused_5 = %ld\n", dv->unused_2);
for (i = 0; i < dv->rank; i++) {
--- 574,579 ----
printf(" unused_2 = %ld\n", dv->unused_2);
printf(" unused_3 = %ld\n", dv->unused_3);
! printf(" unused_4 = %d\n" , dv->unused_4);
! printf(" unused_5 = %ld\n", dv->unused_5);
for (i = 0; i < dv->rank; i++) {
|
|
From: <ras...@us...> - 2003-10-30 16:35:37
|
Update of /cvsroot/chasm-interop/chasm/test/descriptors
In directory sc8-pr-cvs1:/tmp/cvs-serv23956
Modified Files:
testdesc.c farrays.f90
Log Message:
Added more -b and -d tests for different types.
Index: testdesc.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/testdesc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** testdesc.c 17 Oct 2003 18:57:49 -0000 1.33
--- testdesc.c 30 Oct 2003 16:35:33 -0000 1.34
***************
*** 5,9 ****
#include <stdlib.h>
! typedef struct Particle_ {
double position[3];
double velocity[3];
--- 5,9 ----
#include <stdlib.h>
! typedef struct Particle {
double position[3];
double velocity[3];
***************
*** 86,94 ****
# define print_raddr F90_SYMBOL( print_raddr )
# define print_daddr F90_SYMBOL( print_daddr )
! # define print_ia F90_SYMBOL( print_ia )
! # define print_ra F90_SYMBOL( print_ra )
! # define print_da F90_SYMBOL( print_da )
! # define send_iia1d_null F90_SYMBOL( send_iia1d_null )
# define send_iia0d F90_SYMBOL( send_iia0d )
--- 86,103 ----
# define print_raddr F90_SYMBOL( print_raddr )
# define print_daddr F90_SYMBOL( print_daddr )
! # define print_i1a F90_SYMBOL( print_i1a )
! # define print_i2a F90_SYMBOL( print_i2a )
! # define print_i8a F90_SYMBOL( print_i8a )
! # define print_ia F90_SYMBOL( print_ia )
! # define print_ra F90_SYMBOL( print_ra )
! # define print_da F90_SYMBOL( print_da )
! # define print_sizeofs F90_SYMBOL( print_sizeofs )
! # define send_i1a1d_print F90_SYMBOL( send_i1a1d_print )
! # define send_i2a1d_print F90_SYMBOL( send_i2a1d_print )
! # define send_i4a1d_print F90_SYMBOL( send_i4a1d_print )
! # define send_i8a1d_print F90_SYMBOL( send_i8a1d_print )
!
! # define send_iia1d_null F90_SYMBOL( send_iia1d_null )
# define send_iia0d F90_SYMBOL( send_iia0d )
***************
*** 198,206 ****
# define print_raddr F90_SYMBOL( PRINT_RADDR )
# define print_daddr F90_SYMBOL( PRINT_DADDR )
! # define print_ia F90_SYMBOL( PRINT_IA )
! # define print_ra F90_SYMBOL( PRINT_RA )
! # define print_da F90_SYMBOL( PRINT_DA )
! # define send_iia1d_null F90_SYMBOL( SEND_IIA1D_NULL )
# define send_iia0d F90_SYMBOL( SEND_IIA0D )
--- 207,224 ----
# define print_raddr F90_SYMBOL( PRINT_RADDR )
# define print_daddr F90_SYMBOL( PRINT_DADDR )
! # define print_i1a F90_SYMBOL( PRINT_I1A )
! # define print_i2a F90_SYMBOL( PRINT_I2A )
! # define print_i8a F90_SYMBOL( PRINT_I8A )
! # define print_ia F90_SYMBOL( PRINT_IA )
! # define print_ra F90_SYMBOL( PRINT_RA )
! # define print_da F90_SYMBOL( PRINT_DA )
! # define print_sizeofs F90_SYMBOL( PRINT_SIZEOFS )
! # define send_i1a1d_print F90_SYMBOL( SEND_I1A1D_PRINT )
! # define send_i2a1d_print F90_SYMBOL( SEND_I2A1D_PRINT )
! # define send_i4a1d_print F90_SYMBOL( SEND_I4A1D_PRINT )
! # define send_i8a1d_print F90_SYMBOL( SEND_I8A1D_PRINT )
!
! # define send_iia1d_null F90_SYMBOL( SEND_IIA1D_NULL )
# define send_iia0d F90_SYMBOL( SEND_IIA0D )
***************
*** 415,422 ****
--- 433,442 ----
void send_da1d(int*, int*);
+ void send_ia1d_print(int*, int*);
void print_iia1d_null();
void print_ia1d();
void print_ia2d();
void print_ia3d();
+ void print_sizeofs();
void printRaw();
void printDesc();
***************
*** 617,620 ****
--- 637,659 ----
int count = -1;
+ printf("\nPrinting sizeof basic types...\n");
+ print_sizeofs();
+
+ printf("\nPrinting I1A1D\n");
+ send_i1a1d_print(&code, &count);
+ printRawDesc(dv_ia1d);
+
+ printf("\nPrinting I2A1D\n");
+ send_i2a1d_print(&code, &count);
+ printRawDesc(dv_ia1d);
+
+ printf("\nPrinting I4A1D\n");
+ send_i4a1d_print(&code, &count);
+ printRawDesc(dv_ia1d);
+
+ printf("\nPrinting I8A1D\n");
+ send_i8a1d_print(&code, &count);
+ printRawDesc(dv_ia1d);
+
printf("\nPrinting I0D\n");
send_iia0d();
***************
*** 672,675 ****
--- 711,730 ----
int count = -1;
+ printf("\nPrinting I1A1D\n");
+ send_i1a1d_print(&code, &count);
+ cc.printArrayDesc(dv_ia1d, 1);
+
+ printf("\nPrinting I2A1D\n");
+ send_i2a1d_print(&code, &count);
+ cc.printArrayDesc(dv_ia1d, 1);
+
+ printf("\nPrinting I4A1D\n");
+ send_i4a1d_print(&code, &count);
+ cc.printArrayDesc(dv_ia1d, 1);
+
+ printf("\nPrinting I8A1D\n");
+ send_i8a1d_print(&code, &count);
+ cc.printArrayDesc(dv_ia1d, 1);
+
printf("\nPrinting I1D\n");
send_ia1d(&code, &count);
***************
*** 2220,2223 ****
--- 2275,2314 ----
{
printf(" Array: base_addr = %p\n", a);
+ }
+
+
+ /**
+ * Prints the first *count members of the byte array
+ */
+ void print_i1a(char* a, int* count)
+ {
+ int i;
+ for (i = 0; i < *count; i++) {
+ printf(" a[%d] = %d\n", i, a[i]);
+ }
+ }
+
+
+ /**
+ * Prints the first *count members of the short array
+ */
+ void print_i2a(short* a, int* count)
+ {
+ int i;
+ for (i = 0; i < *count; i++) {
+ printf(" a[%d] = %d\n", i, a[i]);
+ }
+ }
+
+
+ /**
+ * Prints the first *count members of the long array
+ */
+ void print_i8a(long* a, int* count)
+ {
+ int i;
+ for (i = 0; i < *count; i++) {
+ printf(" a[%d] = %d\n", i, a[i]);
+ }
}
Index: farrays.f90
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/test/descriptors/farrays.f90,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** farrays.f90 6 Sep 2003 22:04:52 -0000 1.22
--- farrays.f90 30 Oct 2003 16:35:34 -0000 1.23
***************
*** 31,34 ****
--- 31,55 ----
+ subroutine print_sizeofs()
+ use F90_kinds
+ integer(kind=IKIND1) :: i1a(3)
+ integer(kind=IKIND2) :: i2a(3)
+ integer(kind=IKIND4) :: i4a(3)
+ integer(kind=IKIND8) :: i8a(3)
+ integer :: ia(3)
+ real :: ra(3)
+ real(kind(1.0D0)) :: da(3)
+
+ print *, " sizeof IKIND1 = ", sizeof(i1a(1))
+ print *, " sizeof IKIND2 = ", sizeof(i2a(1))
+ print *, " sizeof IKIND4 = ", sizeof(i4a(1))
+ print *, " sizeof IKIND8 = ", sizeof(i8a(1))
+ print *, " sizeof int = ", sizeof(ia(1))
+ print *, " sizeof real = ", sizeof(ra(1))
+ print *, " sizeof double = ", sizeof(da(1))
+
+ end subroutine print_sizeofs
+
+
subroutine send_iia1d_null()
interface
***************
*** 508,511 ****
--- 529,636 ----
+ subroutine send_i1a1d_print(code, ii)
+ use F90_kinds
+ interface
+ subroutine recv_i1a1d(a)
+ use F90_kinds
+ integer(kind=IKIND1), pointer :: a(:)
+ end subroutine
+ end interface
+ external print_iaddr
+ external print_i1a
+ integer :: code, ii
+ integer(kind=IKIND1), target, save :: a(10) = (/1,2,3,4,5,6,7,8,9,10/)
+ integer(kind=IKIND1), pointer, save :: pa(:)
+ pa => a
+ call recv_i1a1d(pa)
+
+ ii = 6
+ if (code .eq. 1) then
+ call print_iaddr(a(1))
+ call print_iaddr(a(2))
+ call print_i1a(a, ii)
+ end if
+ call recv_i1a1d(pa)
+ end subroutine send_i1a1d_print
+
+
+ subroutine send_i2a1d_print(code, ii)
+ use F90_kinds
+ interface
+ subroutine recv_i2a1d(a)
+ use F90_kinds
+ integer(kind=IKIND2), pointer :: a(:)
+ end subroutine
+ end interface
+ external print_iaddr
+ external print_i2a
+ integer :: code, ii
+ integer(kind=IKIND2), target, save :: a(10) = (/1,2,3,4,5,6,7,8,9,10/)
+ integer(kind=IKIND2), pointer, save :: pa(:)
+ pa => a
+ call recv_i2a1d(pa)
+
+ ii = 6
+ if (code .eq. 1) then
+ call print_iaddr(a(1))
+ call print_iaddr(a(2))
+ call print_i2a(a, ii)
+ end if
+ call recv_i2a1d(pa)
+ end subroutine send_i2a1d_print
+
+
+ subroutine send_i4a1d_print(code, ii)
+ use F90_kinds
+ interface
+ subroutine recv_i4a1d(a)
+ use F90_kinds
+ integer(kind=IKIND4), pointer :: a(:)
+ end subroutine
+ end interface
+ external print_iaddr
+ external print_ia
+ integer :: code, ii
+ integer(kind=IKIND4), target, save :: a(10) = (/1,2,3,4,5,6,7,8,9,10/)
+ integer(kind=IKIND4), pointer, save :: pa(:)
+ pa => a
+ call recv_i4a1d(pa)
+
+ ii = 6
+ if (code .eq. 1) then
+ call print_iaddr(a(1))
+ call print_iaddr(a(2))
+ call print_ia(a, ii)
+ end if
+ call recv_i4a1d(pa)
+ end subroutine send_i4a1d_print
+
+
+ subroutine send_i8a1d_print(code, ii)
+ use F90_kinds
+ interface
+ subroutine recv_i8a1d(a)
+ use F90_kinds
+ integer(kind=IKIND8), pointer :: a(:)
+ end subroutine
+ end interface
+ external print_iaddr
+ external print_i8a
+ integer :: code, ii
+ integer(kind=IKIND8), target, save :: a(10) = (/1,2,3,4,5,6,7,8,9,10/)
+ integer(kind=IKIND8), pointer, save :: pa(:)
+ pa => a
+ call recv_i8a1d(pa)
+
+ ii = 6
+ if (code .eq. 1) then
+ call print_iaddr(a(1))
+ call print_iaddr(a(2))
+ call print_i8a(a, ii)
+ end if
+ call recv_i8a1d(pa)
+ end subroutine send_i8a1d_print
+
+
subroutine send_ia1d(code, ii)
interface
***************
*** 529,533 ****
if (code .eq. 1) then
! call print_iaddr(a)
call print_ia(a, ii)
end if
--- 654,659 ----
if (code .eq. 1) then
! call print_iaddr(a(1))
! call print_iaddr(a(2))
call print_ia(a, ii)
end if
***************
*** 652,656 ****
pa => a
if (code .eq. 1) then
! call print_iaddr(pa)
call print_ia(pa, 6)
end if
--- 778,782 ----
pa => a
if (code .eq. 1) then
! call print_iaddr(a)
call print_ia(pa, 6)
end if
***************
*** 723,727 ****
count = 3
if (code .eq. 1) then
! call print_raddr(a)
call print_ra(a, 3)
end if
--- 849,854 ----
count = 3
if (code .eq. 1) then
! call print_raddr(a(1))
! call print_raddr(a(2))
call print_ra(a, 3)
end if
***************
*** 813,817 ****
count = 3
if (code .eq. 1) then
! call print_daddr(a)
call print_da(a, 3)
end if
--- 940,945 ----
count = 3
if (code .eq. 1) then
! call print_daddr(a(1))
! call print_daddr(a(2))
call print_da(a, 3)
end if
|
|
From: <ras...@us...> - 2003-10-29 16:07:57
|
Update of /cvsroot/chasm-interop/chasm/src/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv28643
Modified Files:
Cray.c
Log Message:
Modifications with Jarek during visit.
Index: Cray.c
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/src/compilers/Cray.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Cray.c 28 Oct 2003 20:51:55 -0000 1.11
--- Cray.c 29 Oct 2003 16:07:53 -0000 1.12
***************
*** 87,91 ****
dv->ptr_alloc = 0;
dv->p_or_a = 1;
! dv->a_contig = 1;
dv->dp_flag = 0;
--- 87,93 ----
dv->ptr_alloc = 0;
dv->p_or_a = 1;
!
! if (rank == 0) dv->a_contig = 0;
! else dv->a_contig = 1;
dv->dp_flag = 0;
***************
*** 93,96 ****
--- 95,104 ----
dv->kind_value = 0;
+ dv->unused_1 = 36; /* 40 for D1D */
+ dv->unused_2 = 0;
+ dv->unused_3 = 0;
+ dv->unused_4 = 0;
+ dv->unused_5 = 0;
+
switch (data_type) {
case F90_Integer1:
***************
*** 204,210 ****
int i;
dope_vec* dv = (dope_vec*) desc;
!
if (rank < 0 || rank > 7) return 1;
dv->base_addr = (long) base_addr;
for (i = 0; i < rank; i++) {
--- 212,222 ----
int i;
dope_vec* dv = (dope_vec*) desc;
!
if (rank < 0 || rank > 7) return 1;
+ dv->assoc = 1;
+ if (rank == 0) dv->a_contig = 0;
+ else dv->a_contig = 1;
+
dv->base_addr = (long) base_addr;
for (i = 0; i < rank; i++) {
***************
*** 343,346 ****
--- 355,361 ----
unsigned long size = 1L;
+ dope_vec* dv = (dope_vec*) desc;
+ if (rank < 1 || rank > dv->rank) return 0;
+
for (i = 0; i < rank; i++) {
size *= ((dope_vec*)desc)->dim[i].extent;
***************
*** 360,364 ****
long getArrayLowerBound_Cray(const void* desc, int rank, int dim)
{
! return((dope_vec*) desc)->dim[dim-1].lower_bound;
}
--- 375,382 ----
long getArrayLowerBound_Cray(const void* desc, int rank, int dim)
{
! dope_vec* dv = (dope_vec*) desc;
! if (rank < 1 || rank > dv->rank) return 0;
!
! return dv->dim[dim-1].lower_bound;
}
***************
*** 374,378 ****
unsigned long getArrayExtent_Cray(const void* desc, int rank, int dim)
{
! return ((dope_vec*) desc)->dim[dim-1].extent;
}
--- 392,399 ----
unsigned long getArrayExtent_Cray(const void* desc, int rank, int dim)
{
! dope_vec* dv = (dope_vec*) desc;
! if (rank < 1 || rank > dv->rank) return 0;
!
! return dv->dim[dim-1].extent;
}
***************
*** 389,392 ****
--- 410,415 ----
{
dope_vec* dv = (dope_vec*) desc;
+ if (rank < 1 || rank > dv->rank) return 0;
+
if (dv->max_len < 32) {
return dv->dim[dim-1].stride_mult;
***************
*** 405,408 ****
--- 428,433 ----
unsigned long getArrayDescSize_Cray(int rank)
{
+ if (rank < 0 || rank > 7) return 0;
+
return sizeof(dope_vec) - 3*(7-rank)*sizeof(long);
}
***************
*** 502,512 ****
strcpy(name + funsize + 1, mod_name);
strcpy(name + funsize + 1 + modsize, "_");
- } else {
- strcpy(name + funsize, "_");
}
! /* lower case -> name */
for (i = 0; i < namesize; i++) {
! if ((name[i] > 64) && (name[i] < 91)) name[i] += 32;
}
--- 527,536 ----
strcpy(name + funsize + 1, mod_name);
strcpy(name + funsize + 1 + modsize, "_");
}
! /* lower case -> the symbol name */
!
for (i = 0; i < namesize; i++) {
! if ((name[i] > 64) && (name[i] < 91)) name[i] += 32;
}
***************
*** 545,551 ****
printf(" unused_2 = %ld\n", dv->unused_2);
printf(" unused_3 = %ld\n", dv->unused_3);
for (i = 0; i < dv->rank; i++) {
! printf(" dim[%d] = LB:%ld, Ex:%ld, SM:%ld\n" , i, dv->dim[i].lower_bound,
dv->dim[i].extent, dv->dim[i].stride_mult);
}
--- 569,578 ----
printf(" unused_2 = %ld\n", dv->unused_2);
printf(" unused_3 = %ld\n", dv->unused_3);
+ printf(" unused_4 = %d\n" , dv->unused_1);
+ printf(" unused_5 = %ld\n", dv->unused_2);
for (i = 0; i < dv->rank; i++) {
! printf(" dim[%d] = LB:%ld, Ex:%ld, SM:%ld\n" , i,
! dv->dim[i].lower_bound,
dv->dim[i].extent, dv->dim[i].stride_mult);
}
***************
*** 573,576 ****
--- 600,671 ----
if (dv1->max_len != dv2->max_len ) return 0;
+ /***** debugging code ******/
+
+ i = 1;
+ if (dv1->assoc != dv2->assoc ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->assoc, dv2->assoc);
+ }
+ if (dv1->ptr_alloc != dv2->ptr_alloc) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->ptr_alloc, dv2->ptr_alloc);
+ }
+ if (dv1->p_or_a != dv2->p_or_a ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->p_or_a, dv2->p_or_a);
+ }
+ if (dv1->a_contig != dv2->a_contig ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->a_contig, dv2->a_contig);
+ }
+ if (dv1->rank != dv2->rank ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->rank, dv2->rank);
+ }
+
+ if (dv1->type_code != dv2->type_code ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->type_code, dv2->type_code);
+ }
+ if (dv1->dp_flag != dv2->dp_flag ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->dp_flag, dv2->dp_flag);
+ }
+ if (dv1->star_type != dv2->star_type ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->star_type, dv2->star_type);
+ }
+ if (dv1->elem_size != dv2->elem_size ) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->elem_size, dv2->elem_size);
+ }
+ if (dv1->kind_value != dv2->kind_value) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->kind_value, dv2->kind_value);
+ }
+
+ if (dv1->unused_1 != dv2->unused_1) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->unused_1, dv2->unused_1);
+ }
+ if (dv1->unused_2 != dv2->unused_2) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->unused_2, dv2->unused_2);
+ }
+ if (dv1->unused_3 != dv2->unused_3) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->unused_3, dv2->unused_3);
+ }
+ if (dv1->unused_4 != dv2->unused_4) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->unused_4, dv2->unused_4);
+ }
+ if (dv1->unused_5 != dv2->unused_5) {
+ i = 0;
+ printf("Descriptors NOT Equal %d, %d\n", dv1->unused_5, dv2->unused_5);
+ }
+ if (i == 0) return 0;
+
+ /*******
if (dv1->assoc != dv2->assoc ) return 0;
if (dv1->ptr_alloc != dv2->ptr_alloc) return 0;
***************
*** 588,591 ****
--- 683,689 ----
if (dv1->unused_2 != dv2->unused_2) return 0;
if (dv1->unused_3 != dv2->unused_3) return 0;
+ if (dv1->unused_4 != dv2->unused_4) return 0;
+ if (dv1->unused_5 != dv2->unused_5) return 0;
+ ******/
for (i = 0; i < rank; i++) {
|
|
From: <ras...@us...> - 2003-10-29 16:07:04
|
Update of /cvsroot/chasm-interop/chasm/include/compilers
In directory sc8-pr-cvs1:/tmp/cvs-serv28435
Modified Files:
Cray_dv.h
Log Message:
Modifications with Jarek during visit.
Index: Cray_dv.h
===================================================================
RCS file: /cvsroot/chasm-interop/chasm/include/compilers/Cray_dv.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Cray_dv.h 23 Jul 2003 19:12:11 -0000 1.1
--- Cray_dv.h 29 Oct 2003 16:07:00 -0000 1.2
***************
*** 14,20 ****
unsigned int p_or_a : 2; /* 1 = pointer, 2 = allocatable */
unsigned int a_contig : 1; /* 1 = is contiguous */
! unsigned int unused_1 : 24;
! unsigned int rank : 3; /* number of dimensions */
unsigned int type_code : 8; /* type of data in array */
unsigned int dp_flag : 1; /* Double precision flag (-N113) */
--- 14,22 ----
unsigned int p_or_a : 2; /* 1 = pointer, 2 = allocatable */
unsigned int a_contig : 1; /* 1 = is contiguous */
! unsigned int unused_1 : 11;
! unsigned int unused_2 : 16;
! unsigned int rank : 32; /* number of dimensions */
+ unsigned int unused_3 : 32; /* type of data in array */
unsigned int type_code : 8; /* type of data in array */
unsigned int dp_flag : 1; /* Double precision flag (-N113) */
***************
*** 24,29 ****
/* may be orig_base and orig_size (?, unused?) */
! long unused_2;
! long unused_3;
/* array bounds information */
--- 26,31 ----
/* may be orig_base and orig_size (?, unused?) */
! long unused_4;
! long unused_5;
/* array bounds information */
|