merge in 2.16 changes from devel repo

Author: jeffhammond

AMPI/Branch/Makefile

@@ -0,0 +1,50 @@
+ifndef NUMBER_OF_FUNCTIONS
+  NUMBER_OF_FUNCTIONS=40
+endif
+
+ifndef MATRIX_RANK
+  MATRIX_RANK=10
+endif
+
+include ../../common/AMPI.defs
+##### User configurable options #####
+
+OPTFLAGS     = $(DEFAULT_OPT_FLAGS) 
+#description: change above into something that is a decent optimization on you system
+
+#uncomment any of the following flags (and change values) to change defaults
+
+#RESTRICTFLAG = -DRESTRICT_KEYWORD
+#description: the "restrict" keyword can be used on IA platforms to disambiguate  
+#             data accessed through pointers (requires -restrict compiler flag)
+
+#DEBUGFLAG    = -DVERBOSE
+#description: default diagnostic style is silent
+
+USERFLAGS     = 
+#description: parameter to specify optional flags
+
+EXTOBJS      = 
+LIBS         =
+LIBPATHS     = 
+INCLUDEPATHS = 
+
+### End User configurable options ###
+
+TUNEFLAGS   = $(RESTRICTFLAG) $(DEBUGFLAG) $(USERFLAGS)
+PROGRAM     = branch
+OBJS        = $(PROGRAM).o func.o $(COMOBJS)
+
+default: usage
+	@echo "            \"make veryclean\" to remove custom built files as well"
+
+include ../../common/make.common
+
+func.c:
+	@echo "##########################################################"
+	@echo "##### No file func.c -- invoke func_gen to create it #####"
+	@echo "##########################################################"
+	./func_gen ${MATRIX_RANK} ${NUMBER_OF_FUNCTIONS}
+
+veryclean:
+	rm -f func.c ___*; make clean  

AMPI/Branch/README

@@ -0,0 +1,14 @@
+Option INS_HEAVY of the Branching code requires a customized version
+of file func.c, which contains a variable number of functions of
+variable size. This file is built by invoking script "func_gen,"
+which takes two integer input parameters. The first is the rank of
+the square matrices whose elements get initialized individually by
+one of the functions in func.c. Hence, the number of instructions
+associated with each such function is proportional to rank*rank.
+The second parameters is the number of functions created. These
+functions are all slightly different, but all have the same size.
+
+Usage: func_gen <matrix_rank> <number_of_functions>
+The function is invoked with default values 10 and 40 if no
+values for these variables are supplied on the make command line.
+