issue python-jsonschema#158: Merge unroll_scopes & split_scopes optimization-branches.

* FIX 2 forgotten test-case on resolver-URIs from split_scopes.

x 1.8 faster in big referenced model.

Author: ankostis

jsonschema/tests/test_benchmarks.py

@@ -46,10 +46,20 @@ def test_V3_meta_schema(self):
             278 runs in 2.00 sec
                 ms/run: mean(7.17), std(0.56), MIN(6.50), MAX(10.51)
 
-        splitted_fragments: Time @ Xeon 3.2GHz (x 1.05 faster)::
+        unroll_scopes (a22789a): Time @ Xeon 3.2GHz (x 1.19 faster)::
+
+            344 runs in 2.00 sec
+                ms/run: mean(5.80), std(0.41), MIN(5.50), MAX(8.00)
+
+        splitted_fragments (0306213): Time @ Xeon 3.2GHz (x 1.05 faster)::
 
             290 runs in 2.00 sec
                 ms/run: mean(6.88), std(0.66), MIN(6.00), MAX(12.00)
+
+        combine_untoll_split_scopes: Time @ Xeon 3.2GHz (x 1.25 faster)::
+
+            347 runs in 2.00 sec
+                ms/run: mean(5.75), std(0.67), MIN(5.00), MAX(11.50)
         """
 
         stats = []
@@ -71,10 +81,20 @@ def test_V4_meta_schema(self):
             164 runs in 2.00 sec
                 ms/run: mean(12.15), std(1.36), MIN(11.01), MAX(21.02)
 
-        splitted_fragments: Time @ Xeon 3.2GHz (x 1.16 faster)::
+        unroll_scopes (a22789a): Time @ Xeon 3.2GHz (x 1.09 faster)::
+
+            195 runs in 2.01 sec
+                ms/run: mean(10.24), std(0.70), MIN(9.50), MAX(14.00)
+
+        splitted_fragments (0306213): Time @ Xeon 3.2GHz (x 1.16 faster)::
 
             191 runs in 2.01 sec
                 ms/run: mean(10.47), std(0.81), MIN(9.50), MAX(14.00)
+
+        combine_untoll_split_scopes: Time @ Xeon 3.2GHz (x 1.38 faster)::
+
+            228 runs in 2.01 sec
+                ms/run: mean(8.77), std(0.74), MIN(8.00), MAX(12.50)
         """
 
         stats = []
@@ -96,10 +116,20 @@ def test_both_meta_schemas(self):
             104 runs in 2.01 sec
                 ms/run: mean(19.13), std(1.12), MIN(18.01), MAX(23.02)
 
-        splitted_fragments: Time @ Xeon 3.2GHz (x 1.11 faster)::
+        unroll_scopes (a22789a): Time @ Xeon 3.2GHz (x 1.13 faster)::
+
+            115 runs in 2.00 sec
+                ms/run: mean(17.24), std(2.40), MIN(15.00), MAX(26.00)
+
+        splitted_fragments (0306213): Time @ Xeon 3.2GHz (x 1.11 faster)::
 
             115 runs in 2.00 sec
                 ms/run: mean(17.24), std(1.24), MIN(16.00), MAX(24.51)
+
+        combine_untoll_split_scopes: Time @ Xeon 3.2GHz (x 1.32 faster)::
+
+            138 runs in 2.01 sec
+                ms/run: mean(14.47), std(1.03), MIN(13.50), MAX(19.50)
         """
 
         v_classes = [Draft3Validator, Draft4Validator]
@@ -123,10 +153,20 @@ def test_ref_model(self):
             16 runs in 2.00 sec
                 ms/run: mean(117.80), std(4.32), MIN(113.09), MAX(127.60)
 
-        splitted_fragments: Time @ Xeon 3.2GHz (x 1.12 faster)::
+        unroll_scopes (a22789a): Time @ Xeon 3.2GHz (x 1.43 faster)::
+
+            27 runs in 2.07 sec
+                ms/run: mean(73.77), std(6.58), MIN(65.50), MAX(94.00)
+
+        splitted_fragments (0306213): Time @ Xeon 3.2GHz (x 1.12 faster)::
 
             19 runs in 2.10 sec
                 ms/run: mean(105.07), std(2.45), MIN(102.02), MAX(109.02)
+
+        combine_untoll_split_scopes: Time @ Xeon 3.2GHz (x 1.80 faster)::
+
+            30 runs in 2.03 sec
+                ms/run: mean(65.35), std(4.83), MIN(60.01), MAX(82.02)
         """
 
         stats = []