More cleanup for IA-32 and IA-64 building.
authorGreg Koenig <koenig@uiuc.edu>
Thu, 14 Aug 2003 06:58:17 +0000 (06:58 +0000)
committerGreg Koenig <koenig@uiuc.edu>
Thu, 14 Aug 2003 06:58:17 +0000 (06:58 +0000)
src/arch/vmi-linux-ia64/conv-mach.h
src/arch/vmi-linux-ia64/conv-mach.sh
src/arch/vmi-linux/conv-mach.h
src/arch/vmi-linux/conv-mach.sh
src/arch/vmi/conv-common.h
src/arch/vmi/machine.h

index 356b28a2f2f867143ea60b8e55c120eb3b9e2df1..e01df31272bdbd9ce6acbc136e61660179b7be02 100644 (file)
@@ -5,85 +5,4 @@
 
 #define CMK_MEMORY_PAGESIZE                                16384
 
-
-
-
-#if 0
-/************************************************************************/
-
-
-#define CMK_USE_GM                                         0
-
-
-/*
-#define CMK_CCS_AVAILABLE                                  1
-*/
-#define CMK_CCS_AVAILABLE                                  0 
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-#define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
-
-/*
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         1
-#define CMK_CMIPRINTF_IS_JUST_PRINTF                       0
-*/
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0 
-#define CMK_CMIPRINTF_IS_JUST_PRINTF                       1 
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-/*
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-*/
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-
-/*
-#define CMK_MSG_HEADER_BASIC  { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,d7; }
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,xhdl,info,d9,da,db; }
-*/
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 rank,root,hdl,xhdl,info,d3; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-
-#define CMK_CONV_HOST_WANT_CSH                             1
-
-
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-#define CMK_SPANTREE_USE_SPECIAL_CODE                      0
-
-
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
-#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  0
-
-
-#define CMK_USE_HP_MAIN_FIX                                0
-#define CMK_DONT_USE_HP_MAIN_FIX                           1
-
-/*
-#define CMK_WEB_MODE                                       1
-*/
-
-#define CMK_LBDB_OFF                                      0
-
-#include "conv-mach-opt.h"
-#endif   // 0
-
-
 #endif
index e518aad3e480c0fae1a1e31575e6d034307215fb..e7cd70c79111fd409513bd21b332bdc277db5722 100644 (file)
@@ -15,29 +15,3 @@ CMK_QT='generic64'
 CMK_XIOPTS=''
 CMK_F90LIBS='-lvast90 -lg2c'
 CMK_MOD_EXT="vo"
-
-
-
-######################################################################
-##CMK_CC='gcc '
-#CMK_CC_RELIABLE='gcc '
-#CMK_CC_FASTEST='gcc '
-#CMK_C_DEBUG='-g'
-#CMK_C_OPTIMIZE='-O'
-#CMK_CXX_DEBUG='-g'
-#CMK_CXX_OPTIMIZE='-O'
-##CMK_LD='gcc -static '
-##CMK_LDXX='g++ -static '
-#CMK_LD77=''
-#CMK_M4='m4'
-#CMK_SUF='o'
-#CMK_AR='ar q'
-##CMK_LIBS='-lckqt'
-#CMK_SEQ_LIBS=''
-#CMK_SEQ_CC='gcc'
-#CMK_SEQ_LD='gcc'
-#CMK_SEQ_CXX='g++'
-#CMK_SEQ_LDXX='g++'
-#CMK_CPP_SUFFIX="ii"
-#CMK_XLATPP='charmxlat++ '
-
index 45260f9c8161f8016a251a1e72b11870559c2def..286be40b95747a7fb9a1418efa42e3ce985b0de1 100644 (file)
@@ -3,83 +3,4 @@
 
 #define CMK_MEMORY_PAGESIZE                                8192
 
-
-#if 0
-/************************************************************************/
-
-
-#define CMK_USE_GM                                         0
-
-
-/*
-#define CMK_CCS_AVAILABLE                                  1
-*/
-#define CMK_CCS_AVAILABLE                                  0 
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-#define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
-
-/*
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         1
-#define CMK_CMIPRINTF_IS_JUST_PRINTF                       0
-*/
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0 
-#define CMK_CMIPRINTF_IS_JUST_PRINTF                       1 
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-/*
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-*/
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-
-/*
-#define CMK_MSG_HEADER_BASIC  { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,d7; }
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,xhdl,info,d9,da,db; }
-*/
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 rank,root,hdl,xhdl,info,d3; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-
-#define CMK_CONV_HOST_WANT_CSH                             1
-
-
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-#define CMK_SPANTREE_USE_SPECIAL_CODE                      0
-
-
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
-#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  0
-
-
-#define CMK_USE_HP_MAIN_FIX                                0
-#define CMK_DONT_USE_HP_MAIN_FIX                           1
-
-/*
-#define CMK_WEB_MODE                                       1
-*/
-
-#define CMK_LBDB_OFF                                      0
-
-#include "conv-mach-opt.h"
-#endif   // 0
-
-
 #endif
index c9884540a26ce403884f081f1bed48df7e6e37be..4c3e1651faf0fb1894d94dd8eb58e2f8226223ff 100644 (file)
@@ -1,5 +1,6 @@
 VMI_INCDIR="-I/home/koenig/THESIS/VMI20-install/include" 
 VMI_LIBDIR="-L/home/koenig/THESIS/VMI20-install/lib"
+#
 CMK_CPP_CHARM="/lib/cpp -P"
 CMK_CPP_C="gcc -E $CMK_INCDIR $VMI_INCDIR "
 CMK_CC="gcc $CMK_INCDIR $VMI_INCDIR "
@@ -15,29 +16,3 @@ CMK_QT='generic'
 CMK_XIOPTS=''
 CMK_F90LIBS='-lvast90 -lg2c'
 CMK_MOD_EXT="vo"
-
-
-
-######################################################################
-##CMK_CC='gcc '
-#CMK_CC_RELIABLE='gcc '
-#CMK_CC_FASTEST='gcc '
-#CMK_C_DEBUG='-g'
-#CMK_C_OPTIMIZE='-O'
-#CMK_CXX_DEBUG='-g'
-#CMK_CXX_OPTIMIZE='-O'
-##CMK_LD='gcc -static '
-##CMK_LDXX='g++ -static '
-#CMK_LD77=''
-#CMK_M4='m4'
-#CMK_SUF='o'
-#CMK_AR='ar q'
-##CMK_LIBS='-lckqt'
-#CMK_SEQ_LIBS=''
-#CMK_SEQ_CC='gcc'
-#CMK_SEQ_LD='gcc'
-#CMK_SEQ_CXX='g++'
-#CMK_SEQ_LDXX='g++'
-#CMK_CPP_SUFFIX="ii"
-#CMK_XLATPP='charmxlat++ '
-
index fc006cadd8b6cafa0d7574871f66aad03a35e611..c8d3551b8c8ca2eedc6df7faa2700c74f6be9c90 100644 (file)
@@ -1,7 +1,6 @@
-#define CMK_NET_VERSION                                    0
-
-//#define CMK_CCS_AVAILABLE                                  1
-#define CMK_CCS_AVAILABLE                                  0 
+#define CMK_CCS_AVAILABLE                                  1
+#define NODE_0_IS_CONVHOST                                 1
+#define CMK_WEB_MODE                                       0
 
 #define CMK_CMIPRINTF_IS_A_BUILTIN                         0 
 #define CMK_CMIPRINTF_IS_JUST_PRINTF                       1 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_MSG_HEADER_BASIC  { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,d7; }
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,xhdl,info,d9,da,db; }
-/*
+#define CMK_BROADCAST_SPANNING_TREE                        1
+#define CMK_SPANTREE_MAXSPAN                               4
+#define CMK_SPANTREE_USE_COMMON_CODE                       1
+#define CMK_SPANTREE_USE_SPECIAL_CODE                      0
+
+#if CMK_BROADCAST_SPANNING_TREE
 #define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
 #define CMK_MSG_HEADER_EXT    { CmiUInt2 rank,root,hdl,xhdl,info,d3; }
-*/
+#else
+#define CMK_MSG_HEADER_BASIC  { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,d7; }
+#define CMK_MSG_HEADER_EXT    { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,xhdl,info,d9,da,db; }
+#endif
 #define CMK_MSG_HEADER_BLUEGENE    { CmiUInt2 d0,d1,d2,d3,d4,d5,hdl,xhdl,info,d9,da,db; int nd, n; double rt; CmiInt2 tID; CmiUInt2 hID; char t; int msgID; int srcPe;}
 
 #define CMK_REDUCTION_USES_COMMON_CODE                     1
 #define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-#define CMK_SPANTREE_USE_SPECIAL_CODE                      0
-
 #define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
 #define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  0
 
 #define CMK_IMMEDIATE_MSG                                  0
 
-//#define NODE_0_IS_CONVHOST                                 1
-#define NODE_0_IS_CONVHOST                                 0 
-
-
-
 #define CMK_ASYNC_NOT_NEEDED                               0
 #define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
 #define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
 #define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
 #define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
 
-//#define CMK_GETPAGESIZE_AVAILABLE                          1
-#define CMK_GETPAGESIZE_AVAILABLE                          0
+#define CMK_GETPAGESIZE_AVAILABLE                          1
 
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 #define CMK_THREADS_ARE_WIN32_FIBERS                       0
 
 #define CMK_SIGNAL_NOT_NEEDED                              0
-//#define CMK_SIGNAL_USE_SIGACTION                           0
-//#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
+#define CMK_SIGNAL_USE_SIGACTION                           0
+#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
 
 #define CMK_THREADS_REQUIRE_NO_CPV                         0
 #define CMK_THREADS_COPY_STACK                             0
 
-//#define CMK_TIMER_USE_RDTSC                                1
-//#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_RDTSC                                0
-#define CMK_TIMER_USE_GETRUSAGE                            1
+#define CMK_TIMER_USE_RDTSC                                1
+#define CMK_TIMER_USE_GETRUSAGE                            0
 #define CMK_TIMER_USE_SPECIAL                              0
 #define CMK_TIMER_USE_TIMES                                0
 
 #define CMK_TYPEDEF_FLOAT4 float
 #define CMK_TYPEDEF_FLOAT8 double
 
-//#define CMK_NETPOLL                                        1
-#define CMK_NETPOLL                                        0
-
-//#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-//#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-#define CMK_DEBUG_MODE                                     0
-//#define CMK_WEB_MODE                                       1
-#define CMK_WEB_MODE                                       0
-
-#define CMK_LBDB_ON                                        1
-
-
-
-
-
-#if 0
-
-
-/**********************************************************************/
-
-
-#define CMK_USE_GM                                         0
-
-
-/*
-#define CMK_CCS_AVAILABLE                                  1
-*/
-
-
-/*
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         1
-#define CMK_CMIPRINTF_IS_JUST_PRINTF                       0
-*/
-
-
-/*
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-*/
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-
-#define CMK_CONV_HOST_WANT_CSH                             1
-
-
-
-
-
-#define CMK_USE_HP_MAIN_FIX                                0
-#define CMK_DONT_USE_HP_MAIN_FIX                           1
-
-/*
-#define CMK_WEB_MODE                                       1
-*/
-
-#define CMK_LBDB_OFF                                      0
-
-#include "conv-mach-opt.h"
-
-
-#endif
+#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
+#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
index ecdc58db97ddf64641028150bc97943508761a40..a458329baf6a65caf2fc74b83c0570653a3f45e7 100644 (file)
 #define VMI_DEVICENAME "converse"
 
 #include "vmi.h"
-//#include "crm.h"
-
-
 
 
 
 
 #define CMI_VMI_COLLECT_STATISTICS 0
 
-//#define CMK_BROADCAST_SPANNING_TREE 1
-#define CMK_BROADCAST_SPANNING_TREE 0
-
-
-
-
 
 /* This is the number of seconds to wait for connection setup. */
 #define CMI_VMI_CONNECTION_TIMEOUT 300
@@ -381,14 +372,6 @@ typedef struct
 #define CRM_MSG_REMOVE         2
 #define CRM_MSG_FAILED         3
 
-/*
-typedef enum {
-  CMI_SEND_SYNC,
-  CMI_SEND_ASYNC,
-  CMI_SEND_FREE
-} CMI_SEND_MODE;
-*/
-
 /* Register Context. */
 typedef struct regMsg{
   int np; /* Number of processors. */