Merge pull request cms-sw#160 from kmcdermo/generalize_benchmarks

Generalize benchmarks

.gitignore

@@ -1,11 +1,13 @@
 *~
+*#*
 *.pdf
 *.png
 *.log
 log*
 *.root
 *.o
 *.so
+*.pcm
 *.om
 *.d
 *.ah
@@ -18,6 +20,7 @@ mkFit/mkFit
 mkFit/mkFit-mic
 mkFit/auto-genmplex
 mkFit/auto-matriplex
+benchmark_*_dump.txt
 .*swp
 .*swo
 slurm-[0-9]*.out

Config.cc

@@ -78,12 +78,13 @@ namespace Config
   bool  readSimTrackStates = false;
   bool  inclusiveShorts = false;
   bool  keepHitInfo = false;
+  bool  tryToSaveSimInfo = false;
   matchOpts cmsswMatchingFW = hitBased;
   matchOpts cmsswMatchingBK = trkParamBased;
 
   bool  kludgeCmsHitErrors = false;
   bool  backwardFit = false;
-  bool  backwardFitPCA = false;
+  bool  includePCA = false;
 
   void RecalculateDependentConstants()
   {

Config.h

@@ -316,6 +316,7 @@ namespace Config
   extern bool readSimTrackStates; // need this to fill pulls
   extern bool inclusiveShorts;
   extern bool keepHitInfo;
+  extern bool tryToSaveSimInfo;
   extern matchOpts cmsswMatchingFW;
   extern matchOpts cmsswMatchingBK;
 
@@ -370,7 +371,7 @@ namespace Config
 
   extern bool   kludgeCmsHitErrors;
   extern bool   backwardFit;
-  extern bool   backwardFitPCA;
+  extern bool   includePCA;
 
   // NAN and silly track parameter tracking options
   constexpr bool nan_etc_sigs_enable = false;

ConfigWrapper.cc

@@ -21,11 +21,11 @@ namespace mkfit {
         break;
       case BackwardFit::toFirstLayer:
         Config::backwardFit = true;
-        Config::backwardFitPCA = false;
+        Config::includePCA = false;
         break;
       case BackwardFit::toPCA:
         Config::backwardFit = true;
-        Config::backwardFitPCA = true;
+        Config::includePCA = true;
         break;
       }
 

Makefile

@@ -43,7 +43,7 @@ clean-local:
 	-rm -f ${TGTS} *.d *.o *.om *.so
 	-rm -rf main.dSYM
 	-rm -rf USolids-{host,mic}
-	-rm -rf plotting/*.so plotting/*.d
+	-rm -rf plotting/*.so plotting/*.d plotting/*.pcm
 
 clean: clean-local
 	cd mkFit && ${MAKE} clean

Makefile.config

@@ -23,13 +23,13 @@
 #AVX_512 := 1
 
 # 0. Use gcc-5 from MacPorts on OSX
-# OSXGCC5    := yes
+# OSXGCC5    := 1
 # Use clang from MacPorts on OSX
-# OSXMPCLANG   := yes
+# OSXMPCLANG   := 1
 
 # 1. Use ROOT or not (never used on MIC)
-# Comment out to disable root ("yes" is not relevant)
-#WITH_ROOT := yes
+# Comment out to disable root ("1" is not relevant)
+#WITH_ROOT := 1
 
 # 2. Use gcc (clang by default on mac) or icc
 # Comment out to force using standard c++. For mic only icc can be used.
@@ -61,7 +61,7 @@ endif
 NV := nvcc -prec-sqrt=true -I${CUBROOT} 
 #-g -G -lineinfo
 # Comment out to compile for CPU
-#USE_CUDA := yes
+#USE_CUDA := 1
 # For CUDA: Also need to change maxCandsPerSeed to 8 and nEtaPart to 1
 
 # 3. Optimization
@@ -86,7 +86,7 @@ USE_INTRINSICS := -DMPLEX_USE_INTRINSICS
 # To enforce given vector size (does not work with intrinsics!)
 #USE_INTRINSICS := -DMPT_SIZE=1
 
-USE_VTUNE_NOTIFY := yes
+USE_VTUNE_NOTIFY := 1
 
 # 6. MIC stuff is built when icc is the chosen compiler.
 # MIC build is always done without root.
@@ -106,30 +106,30 @@ USE_VTUNE_NOTIFY := yes
 # If somebody is willing to test this we can try without this
 # but it was giving 50% speedup on icc.
 
-# 8. Use USolids Geometry (turn off for a trivial cylinder)
-#WITH_USOLIDS := yes
+# 8. Use USolids Geometry (turn off for a trivial cylinder) : used in SMatrix code
+#WITH_USOLIDS := 1
 
 # 9. Check track state propagation for success, turns on simple
-# checks of filter convergence
+# checks of filter convergence: used in SMatrix code mostly, still retain as toyMC propagation still uses this
 USE_STATE_VALIDITY_CHECKS := -DCHECKSTATEVALID
 
-# 10. Turn on multiple scattering
+# 10. Turn on multiple scattering: for toyMC SMatrix code. Scattering handled through material map in CMSSW
 #USE_SCATTERING := -DSCATTERING
 
-# 11. In track building, use linear interpolation across a
+# 11. In SMatrix track building, use linear interpolation across a
 # a volume instead of using the geometry
-USE_LINEAR_INTERPOLATION := -DLINEARINTERP
+#USE_LINEAR_INTERPOLATION := -DLINEARINTERP
 
-# 12. Use built tracks for fitting, comment out to fit sim tracks
-ENDTOEND := -DENDTOEND
+# 12. Use built tracks for fitting in SMatrix code, comment out to fit sim tracks
+#ENDTOEND := -DENDTOEND
 
 # 13. Intel Threading Building Blocks.  With icc uses system
 # TBB, otherwise requires a local installation, and paths will
 # have to be adjusted.
-WITH_TBB := yes
+WITH_TBB := 1
 
-# 14. Use inward fit in Conformal fit + final KF Fit
-INWARD_FIT := -DINWARDFIT
+# 14. Use inward fit in Conformal fit + final KF Fit: unsed in mkFit, used in SMatrix
+#INWARD_FIT := -DINWARDFIT
 
 ################################################################
 # Derived settings