2011-08-14 Benjamin Kosnik <bkoz@redhat.com>

	* testsuite/data/make_graph_test_infos.xml: Edit.
	* testsuite/data/make_graph_htmls.xml: Remove
	* scripts/make_graph.py: Edit, fix.
	* scripts/make_graphs.py: Remove.

	* doc/Makefile.am (doc-svg-performance): New.
	(doc-html-performance): Remove.
	* doc/Makefile.in: Regenerate.

	* doc/xml/manual/test_policy_data_structures.xml: Markup changes.
	* doc/xml/manual/policy_data_structures.xml: Same.
	* doc/xml/manual/locale.xml: Same.

	Testsuite renames.
	* performance/ext/pb_ds/priority_queue_text_modify_down_timing.cc:
	Rename.
	* performance/ext/pb_ds/random_int_find_timing.cc: Same.
	* performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
	* performance/ext/pb_ds/multimap_text_find_timing.hpp
	* performance/ext/pb_ds/priority_queue_random_int_push_timing.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
	* performance/ext/pb_ds/tree_order_statistics_timing.cc: Same.
	* performance/ext/pb_ds/multimap_text_insert_mem_usage_large.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_join_timing.cc: Same.
	* performance/ext/pb_ds/multimap_text_insert_timing_small.cc: Same.
	* performance/ext/pb_ds/random_int_subscript_insert_timing.cc: Same.
	* performance/ext/pb_ds/tree_text_lor_find_timing.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc: Same.
	* performance/ext/pb_ds/multimap_text_find_timing_small.cc: Same.
	* performance/ext/pb_ds/text_find_timing.cc: Same.
	* performance/ext/pb_ds/tree_text_insert_timing.cc: Same.
	* performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc: Same.
	* performance/ext/pb_ds/random_int_subscript_find_timing.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_push_timing.cc: Same.
	* performance/ext/pb_ds/tree_split_join_timing.cc: Same.
	* performance/ext/pb_ds/multimap_text_insert_timing_large.cc: Same.
	* performance/ext/pb_ds/priority_queue_text_modify_up_timing.cc: Same.
	* performance/ext/pb_ds/multimap_text_find_timing_large.cc: Same.
	* performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc:
	Same.
	* performance/ext/pb_ds/multimap_text_insert_timing.hpp
	* performance/ext/pb_ds/multimap_text_insert_mem_usage_small.cc: Same.
	* performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc: Same.

	* performance/ext/pb_ds/all_int_find.cc: To these new files...
	* performance/ext/pb_ds/all_int_subscript_find.cc: ...this.
	* performance/ext/pb_ds/all_int_subscript_insert.cc: ...this.
	* performance/ext/pb_ds/all_text_find.cc: ...this.
	* performance/ext/pb_ds/hash_int_erase_mem.cc: ...this.
	* performance/ext/pb_ds/hash_zlob_int_find.cc: ...this.
	* performance/ext/pb_ds/multimap_text_find.hpp
	* performance/ext/pb_ds/multimap_text_find_large.cc: ...this.
	* performance/ext/pb_ds/multimap_text_find_small.cc: ...this.
	* performance/ext/pb_ds/multimap_text_insert.hpp
	* performance/ext/pb_ds/multimap_text_insert_large.cc: ...this.
	* performance/ext/pb_ds/multimap_text_insert_mem.hpp
	* performance/ext/pb_ds/multimap_text_insert_mem_large.cc: ...this.
	* performance/ext/pb_ds/multimap_text_insert_mem_small.cc: ...this.
	* performance/ext/pb_ds/multimap_text_insert_small.cc: ...this.
	* performance/ext/pb_ds/priority_queue_int_push.cc: ...this.
	* performance/ext/pb_ds/priority_queue_int_push_pop.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_join.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_modify_down.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_modify.hpp
	* performance/ext/pb_ds/priority_queue_text_modify_up.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_pop_mem.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_push.cc: ...this.
	* performance/ext/pb_ds/priority_queue_text_push_pop.cc: ...this.
	* performance/ext/pb_ds/tree_order_statistics.cc: ...this.
	* performance/ext/pb_ds/tree_split_join.cc: ...this.
	* performance/ext/pb_ds/tree_text_insert.cc: ...this.
	* performance/ext/pb_ds/tree_text_lor_find.cc: ...this.

	* doc/xml/images/*: Image and image filename changes.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177756 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 88 insertions, 148 deletions

diff --git a/libstdc++-v3/testsuite/data/make_graph_htmls.xml b/libstdc++-v3/testsuite/data/make_graph_htmls.xml
deleted file mode 100644
index 1eb87cf2df7..00000000000
--- a/libstdc++-v3/testsuite/data/make_graph_htmls.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version = "1.0"?>
-<htmls>
-	<html name = "tree_random_int_find_find_timing_test.html">
-	</html>
-	<html name = "assoc_performance_tests.html">
-	</html>
-	<html name = "pq_performance_tests.html">
-	</html>
-	<html name = "hash_text_find_find_timing_test.html">
-	</html>
-	<html name = "hash_random_int_find_find_timing_test.html">
-	</html>
-	<html name = "hash_random_int_subscript_find_timing_test.html">
-	</html>
-	<html name = "hash_random_int_subscript_insert_timing_test.html">
-	</html>
-	<html name = "hash_zlob_random_int_find_find_timing_test.html">
-	</html>
-	<html name = "hash_random_int_erase_mem_usage_test.html">
-	</html>
-	<html name = "tree_text_insert_timing_test.html">
-	</html>
-	<html name = "tree_text_find_find_timing_test.html">
-	</html>
-	<html name = "tree_text_lor_find_find_timing_test.html">
-	</html>
-	<html name = "tree_split_join_timing_test.html">
-	</html>
-	<html name = "tree_order_statistics_timing_test.html">
-	</html>
-	<html name = "priority_queue_text_push_timing_test.html">
-	</html>
-	<html name = "priority_queue_text_push_pop_timing_test.html">
-	</html>
-	<html name = "priority_queue_random_int_push_timing_test.html">
-	</html>
-	<html name = "priority_queue_random_int_push_pop_timing_test.html">
-	</html>
-	<html name = "priority_queue_text_pop_mem_usage_test.html">
-	</html>
-	<html name = "priority_queue_text_join_timing_test.html">
-	</html>
-	<html name = "priority_queue_text_modify_up_timing_test.html">
-	</html>
-	<html name = "priority_queue_text_modify_down_timing_test.html">
-	</html>
-	<html name = "multimap_text_insert_mem_usage_test_small.html">
-	</html>
-	<html name = "multimap_text_insert_timing_test_small.html">
-	</html>
-	<html name = "multimap_text_find_timing_test_small.html">
-	</html>
-	<html name = "multimap_text_insert_mem_usage_test_large.html">
-	</html>
-	<html name = "multimap_text_insert_timing_test_large.html">
-	</html>
-	<html name = "multimap_text_find_timing_test_large.html">
-	</html>
-</htmls>
-		
diff --git a/libstdc++-v3/testsuite/data/make_graph_test_infos.xml b/libstdc++-v3/testsuite/data/make_graph_test_infos.xml
index 0c2da1b3099..66e9fc54cfc 100644
--- a/libstdc++-v3/testsuite/data/make_graph_test_infos.xml
+++ b/libstdc++-v3/testsuite/data/make_graph_test_infos.xml
@@ -1,128 +1,128 @@
 <?xml version = "1.0"?>
 <tests>
-	<test name = "random_int_find_find_timing_test_tree">
-		<file name = "random_int_find_timing.xml"></file>
+	<test name = "tree_int_find">
+		<file name = "all_int_find.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "splay_tree_map"></cntnr>
 		<cntnr name = "ov_tree_map"></cntnr>
 		<cntnr name = "rb_tree_map"></cntnr>
 	</test>   
-	<test name = "tree_split_join_timing_test">
-		<file name = "tree_split_join_timing.xml"></file>
+	<test name = "tree_split_join">
+		<file name = "tree_split_join.xml"></file>
 		<cntnr name = "n_set"></cntnr>
 		<cntnr name = "splay_tree_set"></cntnr>
 		<cntnr name = "ov_tree_set"></cntnr>
 		<cntnr name = "rb_tree_set"></cntnr>
 	</test>
-	<test name = "tree_order_statistics_timing_test">
-		<file name = "tree_order_statistics_timing.xml"></file>
+	<test name = "tree_order_statistics">
+		<file name = "tree_order_statistics.xml"></file>
 		<cntnr name = "n_set"></cntnr>
 		<cntnr name = "splay_tree_ost_set"></cntnr>
 		<cntnr name = "rb_tree_ost_set"></cntnr>
 	</test>
-	<test name = "hash_random_int_erase_mem_usage_test">
-		<file name = "hash_random_int_erase_mem_usage.xml"></file>
+	<test name = "hash_int_erase_mem">
+		<file name = "hash_int_erase_mem.xml"></file>
 		<cntnr name = "n_hash_set_ncah"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "gp_hash_mask_linp_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 	</test>
-	<test name = "cc_hash_random_int_subscript_timing_test_insert">
-		<file name = "random_int_subscript_insert_timing.xml"></file>
+	<test name = "cc_hash_int_subscript_insert">
+		<file name = "all_int_subscript_insert.xml"></file>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "cc_hash_random_int_subscript_timing_test_find">
-		<file name = "random_int_subscript_find_timing.xml"></file>
+	<test name = "cc_hash_int_subscript_find">
+		<file name = "all_int_subscript_find.xml"></file>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "gp_hash_random_int_subscript_timing_test_insert">
-		<file name = "random_int_subscript_insert_timing.xml"></file>
+	<test name = "gp_hash_int_subscript_insert">
+		<file name = "all_int_subscript_insert.xml"></file>
 		<cntnr name = "gp_hash_mod_quadp_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "gp_hash_mask_linp_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "gp_hash_random_int_subscript_timing_test_find">
-		<file name = "random_int_subscript_find_timing.xml"></file>
+	<test name = "gp_hash_int_subscript_find">
+		<file name = "all_int_subscript_find.xml"></file>
 		<cntnr name = "gp_hash_mod_quadp_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "gp_hash_mask_linp_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "ccgp_hash_random_int_subscript_timing_test_insert">
-		<file name = "random_int_subscript_insert_timing.xml"></file>
+	<test name = "ccgp_hash_int_subscript_insert">
+		<file name = "all_int_subscript_insert.xml"></file>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "gp_hash_mod_quadp_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "gp_hash_mask_linp_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "cc_hash_random_int_find_timing_test">
-		<file name = "random_int_find_timing.xml"></file>
+	<test name = "cc_hash_int_find">
+		<file name = "all_int_find.xml"></file>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "gp_hash_random_int_find_timing_test">
-		<file name = "random_int_find_timing.xml"></file>
+	<test name = "gp_hash_int_find">
+		<file name = "all_int_find.xml"></file>
 		<cntnr name = "gp_hash_mod_quadp_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "gp_hash_mask_linp_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "hash_zlob_random_int_find_timing_test">
-		<file name = "hash_zlob_random_int_find_timing.xml"></file>
+	<test name = "hash_zlob_int_find">
+		<file name = "hash_zlob_int_find.xml"></file>
 		<cntnr name = "n_hash_map_ncah"></cntnr>
 		<cntnr name = "gp_hash_mod_quadp_prime_nea_lc_1div8_1div2_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_map"></cntnr>
 	</test>
-	<test name = "text_find_timing_test_hash">
-		<file name = "text_find_timing.xml"></file>
+	<test name = "hash_text_find">
+		<file name = "all_text_find.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mod_prime_nea_lc_1div8_1div1_nsth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_sth_map"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_map"></cntnr>
 	</test>
-	<test name = "text_find_timing_test_tree_like">
-		<file name = "text_find_timing.xml"></file>
+	<test name = "tree_text_find">
+		<file name = "all_text_find.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "rb_tree_map"></cntnr>
 		<cntnr name = "splay_tree_map"></cntnr>
 		<cntnr name = "ov_tree_map"></cntnr>
 		<cntnr name = "pat_trie_map"></cntnr>
 	</test>
-	<test name = "tree_text_insert_timing_test_node_tree">
-		<file name = "tree_text_insert_timing.xml"></file>
+	<test name = "tree_text_insert_node">
+		<file name = "tree_text_insert.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "rb_tree_map"></cntnr>
 		<cntnr name = "splay_tree_map"></cntnr>
 	</test>
-	<test name = "tree_text_insert_timing_test_vector_tree">
-		<file name = "tree_text_insert_timing.xml"></file>
+	<test name = "tree_text_insert_vector">
+		<file name = "tree_text_insert.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "ov_tree_map"></cntnr>
 	</test>
-	<test name = "tree_text_insert_timing_test_pat_trie">
-		<file name = "tree_text_insert_timing.xml"></file>
+	<test name = "tree_text_insert_trie">
+		<file name = "tree_text_insert.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "pat_trie_map"></cntnr>
 	</test>
-	<test name = "tree_text_lor_find_timing_test">
-		<file name = "tree_text_lor_find_timing.xml"></file>
+	<test name = "tree_text_lor_find">
+		<file name = "tree_text_lor_find.xml"></file>
 		<cntnr name = "n_map"></cntnr>
 		<cntnr name = "rb_tree_map"></cntnr>
 		<cntnr name = "splay_tree_map"></cntnr>
 		<cntnr name = "ov_tree_map"></cntnr>
 	</test>
-	<test name = "priority_queue_random_int_push_timing_test">
-		<file name = "priority_queue_random_int_push_timing.xml"></file>
+	<test name = "priority_queue_int_push">
+		<file name = "priority_queue_int_push.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -131,14 +131,14 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "binary_priority_queue_random_int_push_timing_test">
-		<file name = "priority_queue_random_int_push_timing.xml"></file>
+	<test name = "binary_priority_queue_int_push">
+		<file name = "priority_queue_int_push.xml"></file>
 		<cntnr name = "binary_heap"></cntnr>
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_random_int_push_pop_timing_test">
-		<file name = "priority_queue_random_int_push_pop_timing.xml"></file>
+	<test name = "priority_queue_int_push_pop">
+		<file name = "priority_queue_int_push_pop.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -147,15 +147,15 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "binary_priority_queue_random_int_push_pop_timing_test">
-		<file name = "priority_queue_random_int_push_pop_timing.xml"></file>
+	<test name = "binary_priority_queue_int_push_pop">
+		<file name = "priority_queue_int_push_pop.xml"></file>
 		
 		<cntnr name = "binary_heap"></cntnr>
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_push_timing_test">
-		<file name = "priority_queue_text_push_timing.xml"></file>
+	<test name = "priority_queue_text_push">
+		<file name = "priority_queue_text_push.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -164,15 +164,15 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "pairing_priority_queue_text_push_timing_test">
-		<file name = "priority_queue_text_push_timing.xml"></file>
+	<test name = "pairing_priority_queue_text_push">
+		<file name = "priority_queue_text_push.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_push_pop_timing_test">
-		<file name = "priority_queue_text_push_pop_timing.xml"></file>
+	<test name = "priority_queue_text_push_pop">
+		<file name = "priority_queue_text_push_pop.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -181,14 +181,14 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "pairing_priority_queue_text_push_pop_timing_test">
-		<file name = "priority_queue_text_push_pop_timing.xml"></file>
+	<test name = "pairing_priority_queue_text_push_pop">
+		<file name = "priority_queue_text_push_pop.xml"></file>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_modify_up_timing_test">
-		<file name = "priority_queue_text_modify_up_timing.xml"></file>
+	<test name = "priority_queue_text_modify_up">
+		<file name = "priority_queue_text_modify_up.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -197,8 +197,8 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_modify_down_timing_test">
-		<file name = "priority_queue_text_modify_down_timing.xml"></file>
+	<test name = "priority_queue_text_modify_down">
+		<file name = "priority_queue_text_modify_down.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -207,18 +207,18 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_modify_up_timing_test_pairing_thin">
-		<file name = "priority_queue_text_modify_up_timing.xml"></file>
+	<test name = "pairing_priority_queue_text_modify_up_thin">
+		<file name = "priority_queue_text_modify_up.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 	</test>
-	<test name = "priority_queue_text_modify_down_timing_test_pairing_thin">
-		<file name = "priority_queue_text_modify_down_timing.xml"></file>
+	<test name = "pairing_priority_queue_text_modify_down_thin">
+		<file name = "priority_queue_text_modify_down.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 	</test>
-	<test name = "priority_queue_text_join_timing_test">
-		<file name = "priority_queue_text_join_timing.xml"></file>
+	<test name = "priority_queue_text_join">
+		<file name = "priority_queue_text_join.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -227,8 +227,8 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "priority_queue_text_pop_mem_usage_test">
-		<file name = "priority_queue_text_pop_mem_usage.xml"></file>
+	<test name = "priority_queue_text_pop_mem">
+		<file name = "priority_queue_text_pop_mem.xml"></file>
 		<cntnr name = "thin_heap"></cntnr>
 		<cntnr name = "pairing_heap"></cntnr>
 		<cntnr name = "binomial_heap"></cntnr>
@@ -237,74 +237,74 @@
 		<cntnr name = "n_pq_vector"></cntnr>
 		<cntnr name = "n_pq_deque"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_mem_usage_test_small_s2p_hash">
-		<file name = "multimap_text_insert_mem_usage_small.xml"></file>
+	<test name = "multimap_text_insert_mem_small_s2p_hash">
+		<file name = "multimap_text_insert_mem_small.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_timing_test_small_s2p_hash">
-		<file name = "multimap_text_insert_timing_small.xml"></file>
+	<test name = "multimap_text_insert_small_s2p_hash">
+		<file name = "multimap_text_insert_small.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_find_timing_test_small_s2p_hash">
-		<file name = "multimap_text_find_timing_small.xml"></file>
+	<test name = "multimap_text_find_small_s2p_hash">
+		<file name = "multimap_text_find_small.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_mem_usage_test_large_s2p_tree">
-		<file name = "multimap_text_insert_mem_usage_large.xml"></file>
+	<test name = "multimap_text_insert_mem_large_s2p_tree">
+		<file name = "multimap_text_insert_mem_large.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>		
 		<cntnr name = "n_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_timing_test_large_s2p_tree">
-		<file name = "multimap_text_insert_timing_large.xml"></file>
+	<test name = "multimap_text_insert_large_s2p_tree">
+		<file name = "multimap_text_insert_large.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>		
 		<cntnr name = "n_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_find_timing_test_large_s2p_tree">
-		<file name = "multimap_text_find_timing_large.xml"></file>
+	<test name = "multimap_text_find_large_s2p_tree">
+		<file name = "multimap_text_find_large.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>		
 		<cntnr name = "n_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_mem_usage_test_large_s2p_hash">
-		<file name = "multimap_text_insert_mem_usage_large.xml"></file>
+	<test name = "multimap_text_insert_mem_large_s2p_hash">
+		<file name = "multimap_text_insert_mem_large.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_timing_test_large_s2p_hash">
-		<file name = "multimap_text_insert_timing_large.xml"></file>
+	<test name = "multimap_text_insert_large_s2p_hash">
+		<file name = "multimap_text_insert_large.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_find_timing_test_large_s2p_hash">
-		<file name = "multimap_text_find_timing_large.xml"></file>
+	<test name = "multimap_text_find_large_s2p_hash">
+		<file name = "multimap_text_find_large.xml"></file>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_hash_mmap"></cntnr>
 	</test>	
-	<test name = "multimap_text_insert_mem_usage_test_small_s2p_tree">
-		<file name = "multimap_text_insert_mem_usage_small.xml"></file>
+	<test name = "multimap_text_insert_mem_small_s2p_tree">
+		<file name = "multimap_text_insert_mem_small.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>	
 		<cntnr name = "n_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_insert_timing_test_small_s2p_tree">
-		<file name = "multimap_text_insert_timing_small.xml"></file>
+	<test name = "multimap_text_insert_small_s2p_tree">
+		<file name = "multimap_text_insert_small.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_mmap"></cntnr>
 	</test>
-	<test name = "multimap_text_find_timing_test_small_s2p_tree">
-		<file name = "multimap_text_find_timing_small.xml"></file>
+	<test name = "multimap_text_find_small_s2p_tree">
+		<file name = "multimap_text_find_small.xml"></file>
 		<cntnr name = "rb_tree_mmap_lu_mtf_set"></cntnr>
 		<cntnr name = "rb_tree_mmap_cc_hash_mask_exp_nea_lc_1div8_1div2_nsth_set"></cntnr>
 		<cntnr name = "n_mmap"></cntnr>