procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

list_sort_search.cc: Minor formatting fixes.

Browse source 
2004-04-12  Dhruv Matani  <dhruvbird@gmx.net>

	* testsuite/performance/20_util/allocator/list_sort_search.cc:
	Minor formatting fixes.
	* testsuite/performance/20_util/allocator/map_mt_find.cc:
	Likewise.

From-SVN: r80624
This commit is contained in:
Dhruv Matani 2004-04-12 16:11:21 +00:00 • committed by Paolo Carlini
parent 9fabf579ef
commit e0fb1c5c37
3 changed files with 123 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View file

@ -1,3 +1,10 @@
2004-04-12 Dhruv Matani <dhruvbird@gmx.net>
* testsuite/performance/20_util/allocator/list_sort_search.cc:
Minor formatting fixes.
* testsuite/performance/20_util/allocator/map_mt_find.cc:
Likewise.
2004-04-12 Paolo Carlini <pcarlini@suse.de>
* config/locale/gnu/numeric_members.cc

118
libstdc++-v3/testsuite/performance/20_util/allocator/list_sort_search.cc
View file

@ -27,6 +27,10 @@
// 2004-03-11 Dhruv Matani <dhruvbird@HotPOP.com>
#include <list>
#include <map>
#include <algorithm>
#include <cstdlib>
#include <typeinfo>
#include <sstream>
#include <ext/mt_allocator.h>
@ -38,76 +42,72 @@
using namespace std;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::new_allocator;
using __gnu_cxx::__mt_alloc;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
typedef int test_type;
using namespace __gnu_cxx;
template <typename Alloc>
int
Test_Allocator()
{
typedef list<int, Alloc> My_List;
My_List il1;
int const Iter = 150000;
#include <list>
#include <map>
#include <algorithm>
#include <cstdlib>
using namespace std;
int ctr = 3;
while (ctr--)
{
for (int i = 0; i < Iter; ++i)
il1.push_back(rand()%500001);
//Search for random values that may or may not belong to the list.
for (int i = 0; i < 50; ++i)
std::find(il1.begin(), il1.end(), rand() % 100001);
il1.sort();
//Search for random values that may or may not belong to the list.
for (int i = 0; i < 50; ++i)
{
typename My_List::iterator _liter = std::find(il1.begin(),
il1.end(),
rand() % 100001);
if (_liter != il1.end())
il1.erase(_liter);
}
il1.clear();
}
return Iter;
}
template <typename Alloc>
int Test_Allocator ()
{
typedef list<int, Alloc> My_List;
My_List il1;
void
do_test()
{
using namespace __gnu_test;
int status;
Alloc obj;
int const Iter = 150000;
int ctr = 3;
while (ctr--)
{
for (int i = 0; i < Iter; ++i)
il1.push_back (rand()%500001);
//Search for random values that may or may not belong to the list.
for (int i = 0; i < 50; ++i)
std::find (il1.begin(), il1.end(), rand()%100001);
il1.sort ();
//Search for random values that may or may not belong to the list.
for (int i = 0; i < 50; ++i)
{
typename My_List::iterator _liter = std::find (il1.begin(), il1.end(), rand()%100001);
if (_liter != il1.end())
il1.erase (_liter);
}
il1.clear ();
}
return Iter;
}
template <typename Alloc>
void do_test ()
{
using namespace __gnu_test;
int status;
Alloc obj;
time_counter time;
resource_counter resource;
clear_counters(time, resource);
start_counters(time, resource);
int test_iterations = Test_Allocator<Alloc>();
stop_counters(time, resource);
time_counter time;
resource_counter resource;
clear_counters(time, resource);
start_counters(time, resource);
int test_iterations = Test_Allocator<Alloc>();
stop_counters(time, resource);
std::ostringstream comment;
comment << "iterations: " << test_iterations <<endl;
comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
std::ostringstream comment;
comment << "iterations: " << test_iterations << '\t';
comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
int main ()
int main()
{
#ifdef TEST_S0
do_test<new_allocator<int> >();
@ -125,5 +125,3 @@ int main ()
do_test<__pool_alloc<int> >();
#endif
}

118
libstdc++-v3/testsuite/performance/20_util/allocator/map_mt_find.cc
View file

@ -32,7 +32,6 @@
#include <cstdlib>
#include <string>
#include <pthread.h>
#include <typeinfo>
#include <sstream>
#include <ext/mt_allocator.h>
@ -44,17 +43,14 @@
using namespace std;
using __gnu_cxx::malloc_allocator;
using __gnu_cxx::new_allocator;
using __gnu_cxx::__mt_alloc;
using __gnu_cxx::bitmap_allocator;
using __gnu_cxx::__pool_alloc;
typedef int test_type;
using namespace __gnu_cxx;
using namespace std;
bool less_int (int x1, int x2) { return x1<x2; }
bool less_int(int x1, int x2) { return x1<x2; }
#if defined USE_FUNCTION_COMPARE
#define COMPARE_T typeof(&less_int)
@ -65,73 +61,75 @@ bool less_int (int x1, int x2) { return x1<x2; }
#endif
template <typename Alloc>
void *find_proc (void *_vptr)
{
map<int, string, COMPARE_T, Alloc> *_mptr =
reinterpret_cast<map<int, string, COMPARE_T, Alloc>*>(_vptr);
void*
find_proc(void *_vptr)
{
map<int, string, COMPARE_T, Alloc> *_mptr =
reinterpret_cast<map<int, string, COMPARE_T, Alloc>*>(_vptr);
for (int i = 0; i < 700000; ++i)
{
int Finder = rand() % 2000000;
_mptr->find (Finder);
}
return _vptr;
}
for (int i = 0; i < 700000; ++i)
{
int Finder = rand() % 2000000;
_mptr->find(Finder);
}
return _vptr;
}
template <typename Alloc>
int do_test ()
{
COMPARE_T _comp = COMPARE_F;
map<int, string, COMPARE_T, Alloc> imap (_comp);
int x = 2;
pthread_t thr[3];
const int Iter = 1000000;
int
do_test()
{
COMPARE_T _comp = COMPARE_F;
map<int, string, COMPARE_T, Alloc> imap(_comp);
int x = 2;
pthread_t thr[3];
const int Iter = 1000000;
while (x--)
{
for (int i = 0; i < 300000; ++i)
imap.insert (make_pair (rand()%1000000, "_test_data"));
while (x--)
{
for (int i = 0; i < 300000; ++i)
imap.insert(make_pair(rand()%1000000, "_test_data"));
for (int i = 0; i < 100000; ++i)
imap.insert (make_pair (rand()%2000000, "_test_data"));
for (int i = 0; i < 100000; ++i)
imap.insert(make_pair(rand()%2000000, "_test_data"));
pthread_create (&thr[0], NULL, find_proc<Alloc>, (void*)&imap);
pthread_create (&thr[1], NULL, find_proc<Alloc>, (void*)&imap);
pthread_create (&thr[2], NULL, find_proc<Alloc>, (void*)&imap);
pthread_create(&thr[0], NULL, find_proc<Alloc>, (void*)&imap);
pthread_create(&thr[1], NULL, find_proc<Alloc>, (void*)&imap);
pthread_create(&thr[2], NULL, find_proc<Alloc>, (void*)&imap);
pthread_join (thr[0], 0);
pthread_join (thr[1], 0);
pthread_join (thr[2], 0);
pthread_join(thr[0], 0);
pthread_join(thr[1], 0);
pthread_join(thr[2], 0);
imap.clear ();
}
return Iter;
}
imap.clear();
}
return Iter;
}
template <typename Alloc>
void exec_tests ()
{
using namespace __gnu_test;
int status;
COMPARE_T _comp = COMPARE_F;
map<int, string, COMPARE_T, Alloc> obj (_comp);
void
exec_tests()
{
using namespace __gnu_test;
int status;
COMPARE_T _comp = COMPARE_F;
map<int, string, COMPARE_T, Alloc> obj(_comp);
time_counter time;
resource_counter resource;
clear_counters(time, resource);
start_counters(time, resource);
int test_iterations = do_test<Alloc>();
stop_counters(time, resource);
time_counter time;
resource_counter resource;
clear_counters(time, resource);
start_counters(time, resource);
int test_iterations = do_test<Alloc>();
stop_counters(time, resource);
std::ostringstream comment;
comment << "iterations: " << test_iterations <<endl;
comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
std::ostringstream comment;
comment << "iterations: " << test_iterations << '\t';
comment << "type: " << abi::__cxa_demangle(typeid(obj).name(),
0, 0, &status);
report_header(__FILE__, comment.str());
report_performance(__FILE__, string(), time, resource);
}
int main()
{