From: mquinson Date: Tue, 8 Feb 2005 14:23:49 +0000 (+0000) Subject: Reorder and cleanup the architecture table X-Git-Tag: v3.3~4426 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d9af359d50c749f3eafaf037ee58f1ba0c4bf8dd Reorder and cleanup the architecture table git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@925 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/acmacro/gras_arch.m4 b/acmacro/gras_arch.m4 index 2ee3adc4ef..e05cac69a5 100644 --- a/acmacro/gras_arch.m4 +++ b/acmacro/gras_arch.m4 @@ -176,15 +176,22 @@ trace="${trace}_D:4/${ac_cv_struct_boundary_float}:8/${ac_cv_struct_boundary_dou # sizeof float/double are not tested since IEEE 754 is assumed. # Check README.IEEE for rational. + +# The numbers after the _ in the arch name are the maximal packing boundary. +# big32_2 means that all data are aligned on a 2 bytes boundary. (ARM) +# big32_8_4 means that some or them are aligned on 8 bytes, some are on 4 bytes (AIX) case $trace in - l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=0; gras_arch_name=little32;; - l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=1; gras_arch_name=little64;; - B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=2; gras_arch_name=big32;; - B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=3; gras_arch_name=big64;; - B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=4; gras_arch_name=aix;; - B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:) gras_arch=5; gras_arch_name=arm;; - l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=6; gras_arch_name=win32;; - B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=7; gras_arch_name=g5;; + l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=0; gras_arch_name=little32;; + l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=1; gras_arch_name=little32_4;; + + l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=2; gras_arch_name=little64;; + + B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=3; gras_arch_name=big32;; + B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=4; gras_arch_name=big32_8_4;; + B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=5; gras_arch_name=big32_4;; + B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:) gras_arch=6; gras_arch_name=big32_2;; + + B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=7; gras_arch_name=big64;; esac if test x$gras_arch = xunknown ; then AC_MSG_RESULT([damnit ($trace)]) diff --git a/src/gras/DataDesc/ddt_convert.c b/src/gras/DataDesc/ddt_convert.c index 8b1759b800..f144a2f86f 100644 --- a/src/gras/DataDesc/ddt_convert.c +++ b/src/gras/DataDesc/ddt_convert.c @@ -21,39 +21,45 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ddt_convert,datadesc, /*** *** Table of all known architectures: *** - *** l C<1/1> I<2/2:4/4:4/4:8/4> P<4/4:4/4> D<4/4:8/4> - *** l C<1/1> I<2/2:4/4:8/8:8/8> P<4/4:4/4> D<4/4:8/8> - *** B C<1/1> I<2/2:4/4:4/8:8/8> P<4/4:4/4> D<4/4:8/4> - *** B C<1/1> I<2/2:4/8:8/8:8/8> P<4/4:4/4> D<4/4:8/4> - *** B C:1/1: I:2/2:4/4:4/4:8/8: P:4/4:4/4: D:4/4:8/4: AIX - *** B C:1/1: I:2/2:4/2:4/2:8/2: P:4/2:4/2: D:4/2:8/2: ARM - *** l C<1/1> I<2/2:4/4:4/4:8/8> P<4/4:4/4> D<4/4:8/8> win32 + l_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=0; gras_arch_name=little32;; + l_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=1; gras_arch_name=little32_4;; + + l_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=2; gras_arch_name=little64;; + + B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/8:) gras_arch=3; gras_arch_name=big32;; + B_C:1/1:_I:2/2:4/4:4/4:8/8:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=4; gras_arch_name=big32_8_4;; + B_C:1/1:_I:2/2:4/4:4/4:8/4:_P:4/4:4/4:_D:4/4:8/4:) gras_arch=5; gras_arch_name=big32_4;; + B_C:1/1:_I:2/2:4/2:4/2:8/2:_P:4/2:4/2:_D:4/2:8/2:) gras_arch=6; gras_arch_name=big32_2;; + + B_C:1/1:_I:2/2:4/4:8/8:8/8:_P:8/8:8/8:_D:4/4:8/8:) gras_arch=7; gras_arch_name=big64;; + ***/ const gras_arch_desc_t gras_arches[gras_arch_count] = { - {"little32", 0, {1,2,4,4,8, 4,4, 4,8}, + {"little32", 0, {1,2,4,4,8, 4,4, 4,8}, /* win32 */ + {1,2,4,4,8, 4,4, 4,8}}, + + {"little32_4", 0, {1,2,4,4,8, 4,4, 4,8}, /* linux x86 */ {1,2,4,4,4, 4,4, 4,4}}, - {"little64", 0, {1,2,4,8,8, 8,8, 4,8}, + {"little64", 0, {1,2,4,8,8, 8,8, 4,8}, /* alpha, ia64 */ {1,2,4,8,8, 8,8, 4,8}}, - {"big32", 1, {1,2,4,4,8, 4,4, 4,8}, + {"big32", 1, {1,2,4,4,8, 4,4, 4,8}, {1,2,4,4,8, 4,4, 4,8}}, - {"big64", 1, {1,2,4,8,8, 8,8, 4,8}, - {1,2,4,8,8, 8,8, 4,8}}, - {"aix", 1, {1,2,4,4,8, 4,4, 4,8}, + {"big32_8_4", 1, {1,2,4,4,8, 4,4, 4,8}, /* AIX */ {1,2,4,4,8, 4,4, 4,4}}, - {"arm", 1, {1,2,4,4,8, 4,4, 4,8}, + {"big32_4", 1, {1,2,4,4,8, 4,4, 4,8}, /* G5 */ + {1,2,4,4,4, 4,4, 4,4}}, + + {"big32_2", 1, {1,2,4,4,8, 4,4, 4,8}, /* ARM */ {1,2,2,2,2, 2,2, 2,2}}, - {"win32", 0, {1,2,4,4,8, 4,4, 4,8}, - {1,2,4,4,8, 4,4, 4,8}}, - - {"g5", 1, {1,2,4,4,8, 4,4, 4,8}, - {1,2,4,4,4, 4,4, 4,4}} + {"big64", 1, {1,2,4,8,8, 8,8, 4,8}, /* sparc */ + {1,2,4,8,8, 8,8, 4,8}} }; const char *gras_datadesc_arch_name(int code) { diff --git a/testsuite/gras/datadesc.aix b/testsuite/gras/datadesc.aix deleted file mode 100644 index 04d21d8caf..0000000000 Binary files a/testsuite/gras/datadesc.aix and /dev/null differ diff --git a/testsuite/gras/datadesc.g5 b/testsuite/gras/datadesc.g5 deleted file mode 100644 index 0a87ce0275..0000000000 Binary files a/testsuite/gras/datadesc.g5 and /dev/null differ diff --git a/testsuite/gras/datadesc.win32 b/testsuite/gras/datadesc.win32 deleted file mode 100644 index 3f26a9e884..0000000000 Binary files a/testsuite/gras/datadesc.win32 and /dev/null differ