Merge branch 'lucca-tests-bench' into lucca-optim

diff --git a/beau b/beau
new file mode 100755 (executable)
index 0000000..01d2cef
--- /dev/null
+++ b/beau
@@ -0,0 +1 @@
+grep -v average log_benchmark | grep -v faults| grep -v block| grep -v swap| grep -v messages| grep -v signals| grep -v voluntary > log_benchmark.txt
\ No newline at end of file

diff --git a/benchmark b/benchmark
index 37e4eed..a8d6c0f 100755 (executable)
--- a/benchmark
+++ b/benchmark
@@ -4,7 +4,7 @@
 for native in ./bench.native*; do
     echo $native
     for quer in ./tests/queries/XPath-PT/A1.xpl ; do
-        /usr/bin/time -l  $native ./tests/docs/XPath-PT.xml -f ./tests/queries/XPath-PT/A1.xpl
+        /usr/bin/time -l  $native ./tests/docs/XPath-PT.xml -f ./tests/queries/XPath-PT/my.xpl
     done
     echo 
 done
\ No newline at end of file

diff --git a/log_benchmark b/log_benchmark
index 4c44f58..5b57f1a 100644 (file)
--- a/log_benchmark
+++ b/log_benchmark
@@ -1,3 +1,114 @@
+                        ## 17.07   14:00 ##
+#### Big query (4k, 1400 col):
+./bench.native_Core+Extentions+Optim-hconsed_V1_23f38d4
+      145.71 real       144.44 user         1.05 sys
+ 998281216  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    247316  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+      9505  involuntary context switches
+
+./bench.native_Core+FS+Self_tested_1f48f81
+      178.02 real       176.91 user         1.08 sys
+1046331392  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    261351  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+      1569  involuntary context switches
+
+./bench.native_OptimTag-without-hconsed-formula_71804e8
+      139.68 real       138.71 user         0.93 sys
+ 996233216  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    245792  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         1  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+      1955  involuntary context switches
+
+
+
+
+#### Small query:
+./bench.native_Core+Extentions+Optim-hconsed_V1_23f38d4
+       16.20 real        15.42 user         0.76 sys
+ 958164992  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    235730  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+       391  involuntary context switches
+
+./bench.native_Core+FS+Self_tested_1f48f81
+       21.16 real        20.37 user         0.77 sys
+ 957571072  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    235585  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+       347  involuntary context switches
+
+./bench.native_OptimTag-without-hconsed-formula_71804e8
+       16.26 real        15.48 user         0.77 sys
+ 965349376  maximum resident set size
+         0  average shared memory size
+         0  average unshared data size
+         0  average unshared stack size
+    238252  page reclaims
+         0  page faults
+         0  swaps
+         0  block input operations
+         0  block output operations
+         0  messages sent
+         0  messages received
+         0  signals received
+         0  voluntary context switches
+       341  involuntary context switches
+
+
+
+                        ## Older ##
 ./solve.native_BUOracle-and-BUOverMax_hconsed_d55b57e
        22.49 real        21.79 user         0.68 sys
  742887424  maximum resident set size

diff --git a/log_benchmark.txt b/log_benchmark.txt
new file mode 100644 (file)
index 0000000..58a7c47
--- /dev/null
+++ b/log_benchmark.txt
@@ -0,0 +1,58 @@
+                        ## 17.07   14:00 ##
+#### Big query (4k, 1400 col):
+./bench.native_Core+Extentions+Optim-hconsed_V1_23f38d4
+      145.71 real       144.44 user         1.05 sys
+ 998281216  maximum resident set size
+    247316  page reclaims
+
+./bench.native_Core+FS+Self_tested_1f48f81
+      178.02 real       176.91 user         1.08 sys
+1046331392  maximum resident set size
+    261351  page reclaims
+
+./bench.native_OptimTag-without-hconsed-formula_71804e8
+      139.68 real       138.71 user         0.93 sys
+ 996233216  maximum resident set size
+    245792  page reclaims
+
+
+
+
+#### Small query:
+./bench.native_Core+Extentions+Optim-hconsed_V1_23f38d4
+       16.20 real        15.42 user         0.76 sys
+ 958164992  maximum resident set size
+    235730  page reclaims
+
+./bench.native_Core+FS+Self_tested_1f48f81
+       21.16 real        20.37 user         0.77 sys
+ 957571072  maximum resident set size
+    235585  page reclaims
+
+./bench.native_OptimTag-without-hconsed-formula_71804e8
+       16.26 real        15.48 user         0.77 sys
+ 965349376  maximum resident set size
+    238252  page reclaims
+
+
+
+                        ## Older ##
+./solve.native_BUOracle-and-BUOverMax_hconsed_d55b57e
+       22.49 real        21.79 user         0.68 sys
+ 742887424  maximum resident set size
+    185522  page reclaims
+
+./solve.native_BUOracle_hconsed_47c4225
+       30.84 real        30.04 user         0.68 sys
+ 743706624  maximum resident set size
+    185722  page reclaims
+
+./solve.native_BURoacle-and-BUOverMax-and-fst-TP-Max_hconsed_71804e8
+       22.72 real        22.01 user         0.64 sys
+ 742940672  maximum resident set size
+    185535  page reclaims
+
+./solve.native_NO_hconsign_cafb194
+       31.81 real        29.61 user         0.67 sys
+ 743292928  maximum resident set size
+    185591  page reclaims

diff --git a/one_benchmark b/one_benchmark
index 1affafc..a139a0e 100755 (executable)
--- a/one_benchmark
+++ b/one_benchmark
@@ -1 +1 @@
-/usr/bin/time -l  ./solve.native ./tests/docs/XPath-PT.xml -f ./tests/queries/XPath-PT/A1.xpl
\ No newline at end of file
+/usr/bin/time -l  ./bench.native ./tests/docs/XPath-PT.xml -f ./tests/queries/XPath-PT/my.xpl
\ No newline at end of file

diff --git a/tests/docs/XPath-PT.xml b/tests/docs/XPath-PT.xml
deleted file mode 100644 (file)
index 0c21bc6..0000000
--- a/tests/docs/XPath-PT.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<X>
-  <b>
-    <a>
-      <c>
-        <e>
-          <f>
-            <g>
-              <b>
-                <g/>
-              </b>
-            </g>
-          </f>
-          <e/>
-        </e>
-      </c>
-    </a>
-  </b>
-  <a>
-    <c>
-      <e>
-        <f/>
-      </e>
-      <f>
-        <X>
-          <g/>
-          <b>
-            <g/>
-          </b>
-        </X>
-        <e/>
-      </f>
-    </c>
-  </a>
-</X>

diff --git a/tests/docs/generate.sh b/tests/docs/generate.sh
index e152769..c5a0ea3 100755 (executable)
--- a/tests/docs/generate.sh
+++ b/tests/docs/generate.sh
@@ -1 +1 @@
-./a.out -f 0.5 -o XPath-PT.xml -i 
\ No newline at end of file
+./a.out -f 0.7 -o XPath-PT.xml -i 
\ No newline at end of file

diff --git a/tests/queries/XPath-PT/my.xpl b/tests/queries/XPath-PT/my.xpl
new file mode 100644 (file)
index 0000000..59ed470
--- /dev/null
+++ b/tests/queries/XPath-PT/my.xpl
@@ -0,0 +1 @@
+/child::site[descendant::annotations or descendant::*/descendant::item/descendant::*/descendant::* or descendant::mailbox or descendant::*/descendant::item/descendant::*/descendant::* or descendant::person [descendant::address[descendant::city] or descendant::*/descendant::item/descendant::*/descendant::* or descendant::item[child::description or descendant::*/descendant::item/descendant::*/descendant::* or descendant::text]]]/descendant::*[descendant::person [descendant::address[descendant::city] or descendant::*/descendant::item/descendant::*/descendant::* or descendant::item[child::description or descendant::*/descendant::item/descendant::*/descendant::* or descendant::text]]]/descendant::regions[descendant::annotations or descendant::*/descendant::item/descendant::*/descendant::* or descendant::mailbox or descendant::*/descendant::item/descendant::*/descendant::* or descendant::person [descendant::address[descendant::city] or descendant::*/descendant::item/descendant::*/descendant::* or descendant::item[child::description or descendant::*/descendant::item/descendant::*/descendant::* or descendant::text]]]/descendant::*[descendant::person [descendant::address[descendant::city] or descendant::*/descendant::item/descendant::*/descendant::* or descendant::item[child::description or descendant::*/descendant::item/descendant::*/descendant::* or descendant::text]]]/descendant::mail
\ No newline at end of file