1.1 --- a/__brch__Common_ancestor	Sat Aug 25 12:22:21 2012 -0700
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,34 +0,0 @@
     1.4 -A HW branch for:
     1.5 -
     1.6 -generic MultiCore machines with x86 64bit instruction set
     1.7 -
     1.8 -This branch shouldn't be used, except as a lazy fall-back.  Instead, try out other branches tuned to specific hardware platforms to find the one that performs best on your machine.  Use the "exe_time_vs_task_size" project to generate curves of overhead, and compare result from various branches.
     1.9 -
    1.10 -Note, if this branch is used, then NUM_CORES in VMS_HW_specific_defs.h file has to be updated with the number of cores in your machine
    1.11 -
    1.12 -
    1.13 -========  Background on branch naming  =========
    1.14 -
    1.15 -There are two kinds of branchs: ones used to develop features, and ones tuned to particular hardware.  A given HW branch may combine features from several feature-branches, picking and choosing among them.
    1.16 -
    1.17 -After Feb 2012, branches are named by the scheme:
    1.18 -
    1.19 -feat__<feat_descr>__<HW_feat_dev_on>
    1.20 -
    1.21 -HW__<desc_of_HW_brch_tuned_for>
    1.22 -
    1.23 -where <HW_feat_dev_on> and <desc_of_HW_brch_tuned_for> follow the pattern:
    1.24 -
    1.25 -<num_socket> x <num_cores>_<Manuf>_<special_features>
    1.26 -
    1.27 -Examples:
    1.28 -
    1.29 -feat__exp_array_malloc
    1.30 -
    1.31 -feat__rand_backoff__4x10_Intel_WestmereEx
    1.32 -
    1.33 -HW__1x4_Intel_SandyBridge
    1.34 -
    1.35 -HW__4x10_Intel_WestmereEx
    1.36 -
    1.37 -HW__1x4_AMD_mobile

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/__brch__Dev_ML	Mon Sep 03 03:28:56 2012 -0700
     2.3 @@ -0,0 +1,34 @@
     2.4 +A HW branch for:
     2.5 +
     2.6 +generic MultiCore machines with x86 64bit instruction set
     2.7 +
     2.8 +This branch shouldn't be used, except as a lazy fall-back.  Instead, try out other branches tuned to specific hardware platforms to find the one that performs best on your machine.  Use the "exe_time_vs_task_size" project to generate curves of overhead, and compare result from various branches.
     2.9 +
    2.10 +Note, if this branch is used, then NUM_CORES in VMS_HW_specific_defs.h file has to be updated with the number of cores in your machine
    2.11 +
    2.12 +
    2.13 +========  Background on branch naming  =========
    2.14 +
    2.15 +There are two kinds of branchs: ones used to develop features, and ones tuned to particular hardware.  A given HW branch may combine features from several feature-branches, picking and choosing among them.
    2.16 +
    2.17 +After Feb 2012, branches are named by the scheme:
    2.18 +
    2.19 +feat__<feat_descr>__<HW_feat_dev_on>
    2.20 +
    2.21 +HW__<desc_of_HW_brch_tuned_for>
    2.22 +
    2.23 +where <HW_feat_dev_on> and <desc_of_HW_brch_tuned_for> follow the pattern:
    2.24 +
    2.25 +<num_socket> x <num_cores>_<Manuf>_<special_features>
    2.26 +
    2.27 +Examples:
    2.28 +
    2.29 +feat__exp_array_malloc
    2.30 +
    2.31 +feat__rand_backoff__4x10_Intel_WestmereEx
    2.32 +
    2.33 +HW__1x4_Intel_SandyBridge
    2.34 +
    2.35 +HW__4x10_Intel_WestmereEx
    2.36 +
    2.37 +HW__1x4_AMD_mobile