65 files changed, 1196 insertions, 1383 deletions

diff --git a/.gitignore b/.gitignore
index 057a48b..0e0db96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,9 @@
 *.txt.clean
 # But not benchmark lists
 !*Names.txt
+# Special-case .txt handling for SD-VBS
+**/12345.txt
+!SD-VBS/benchmarks/**/*.txt
 
 # Ignore DIS benchmark binaries
 **/field
@@ -40,12 +43,7 @@
 **/statemate
 **/susan
 
-# Ignore random walk benchmark
-**/random_walk
-
-# Ignore misc debug and build outputs
-**/.gdb_history
-
+# Ignore SD-VBS binaries
 **/mser
 **/multi_ncut
 **/stitch
@@ -56,5 +54,10 @@
 **/sift
 **/localization
 **/disparity
-**/12345.txt
-!SD-VBS/**/*.txt
+
+# Ignore random walk benchmark
+**/random_walk
+
+# Ignore misc temporary files
+**/.gdb_history
+*.swp
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..ebc7523
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "smt_analysis/plotille"]
+        path = smt_analysis/plotille
+        url = https://github.com/tammoippen/plotille.git
+[submodule "wbinvd"]
+        path = wbinvd
+        url = https://github.com/JoshuaJB/wbinvd.git
diff --git a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
index 431c02c..7d45ada 100644
--- a/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
+++ b/SD-VBS/benchmarks/disparity/src/c/script_disparity.c
@@ -28,9 +28,7 @@ int main(int argc, char* argv[])
     int WIN_SZ=8, SHIFT=64;
     FILE* fp;
     
-    printf("Image 1: ");
     scanf("%s", im1);
-    printf("Image 2: ");
     scanf("%s", im2);
 #ifdef CHECK
     char checkFile[100] = "./expected_C.txt";
@@ -86,17 +84,15 @@ int main(int argc, char* argv[])
     Iright_moved = iSetArray(paddedRows, paddedCols, 0);
 
     range = iMallocHandle(1, 2);
-    printf("starting..\n");
-    for_each_job{
-    retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT, 
-                   minSAD, retDisp, halfWin,
-                   IrightPadded, IleftPadded, Iright_moved,
-                   retSAD, SAD, integralImg,
-                   range);
+    for_each_job {
+        retDisparity = getDisparity(imleft, imright, WIN_SZ, SHIFT,
+               minSAD, retDisp, halfWin,
+               IrightPadded, IleftPadded, Iright_moved,
+               retSAD, SAD, integralImg,
+               range);
     }
-    printf("ending\n");
 
-#ifdef CHECK   
+#ifdef CHECK
     /** Self checking - use expected.txt from data directory  **/
     {
         int tol, ret=0;
diff --git a/SD-VBS/benchmarks/localization/src/c/script_localization.c b/SD-VBS/benchmarks/localization/src/c/script_localization.c
index 3392320..ed37132 100644
--- a/SD-VBS/benchmarks/localization/src/c/script_localization.c
+++ b/SD-VBS/benchmarks/localization/src/c/script_localization.c
@@ -41,7 +41,6 @@ int main(int argc, char* argv[])