Patchwork [v3] Move around some unordered_* tests

login
register
mail settings
Submitter Paolo Carlini
Date Aug. 13, 2010, 1:09 p.m.
Message ID <4C6543FF.6080008@oracle.com>
Download mbox | patch
Permalink /patch/61681/
State New
Headers show

Comments

Paolo Carlini - Aug. 13, 2010, 1:09 p.m.
Hi,

committed to mainline.

Paolo.

///////////////////
2010-08-13  Paolo Carlini  <paolo.carlini@oracle.com>

	* testsuite/23_containers/unordered_map/dr1189.cc: Move to...
	* testsuite/23_containers/unordered_map/hash_policy/dr1189.cc:
	... here.
	* testsuite/23_containers/unordered_set/dr1189.cc: Move to...
	* testsuite/23_containers/unordered_set/hash_policy/dr1189.cc:
	... here.
	* testsuite/23_containers/unordered_multimap/dr1189.cc: Move to...
	* testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc:
	... here.
	* testsuite/23_containers/unordered_multiset/dr1189.cc: Move to...
	* testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc:
	... here.

	* testsuite/23_containers/unordered_set/hash_policy/26132.cc: New.

Patch

Index: testsuite/23_containers/unordered_map/dr1189.cc
===================================================================
--- testsuite/23_containers/unordered_map/dr1189.cc	(revision 163221)
+++ testsuite/23_containers/unordered_map/dr1189.cc	(working copy)
@@ -1,48 +0,0 @@ 
-// { dg-options "-std=gnu++0x" }
-// 2010-03-10  Paolo Carlini  <paolo.carlini@oracle.com>
-//
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <testsuite_hooks.h>
-
-// DR 1189. Awkward interface for changing the number of buckets
-// in an unordered associative container
-void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
-  std::unordered_map<int, double> m1;
-  m1.reserve(10);
-  VERIFY( m1.bucket_count() >= 10 );
-
-  m1.reserve(100);
-  VERIFY( m1.bucket_count() >= 100 );
-
-  std::unordered_map<int, double> m2(100);
-  VERIFY( m2.bucket_count() >= 100 );
-
-  m2.reserve(1000);
-  VERIFY( m2.bucket_count() >= 1000 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
Index: testsuite/23_containers/unordered_multimap/dr1189.cc
===================================================================
--- testsuite/23_containers/unordered_multimap/dr1189.cc	(revision 163221)
+++ testsuite/23_containers/unordered_multimap/dr1189.cc	(working copy)
@@ -1,48 +0,0 @@ 
-// { dg-options "-std=gnu++0x" }
-// 2010-03-10  Paolo Carlini  <paolo.carlini@oracle.com>
-//
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_map>
-#include <testsuite_hooks.h>
-
-// DR 1189. Awkward interface for changing the number of buckets
-// in an unordered associative container
-void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
-  std::unordered_multimap<int, double> mm1;
-  mm1.reserve(10);
-  VERIFY( mm1.bucket_count() >= 10 );
-
-  mm1.reserve(100);
-  VERIFY( mm1.bucket_count() >= 100 );
-
-  std::unordered_map<int, double> mm2(100);
-  VERIFY( mm2.bucket_count() >= 100 );
-
-  mm2.reserve(1000);
-  VERIFY( mm2.bucket_count() >= 1000 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
Index: testsuite/23_containers/unordered_set/hash_policy/26132.cc
===================================================================
--- testsuite/23_containers/unordered_set/hash_policy/26132.cc	(revision 0)
+++ testsuite/23_containers/unordered_set/hash_policy/26132.cc	(revision 0)
@@ -0,0 +1,57 @@ 
+// { dg-options "-std=gnu++0x" }
+
+// 2010-08-13  Paolo Carlini  <paolo.carlini@oracle.com>
+//
+// Copyright (C) 2010 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+#include <unordered_set>
+#include <testsuite_hooks.h>
+
+// libstdc++/26132
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  for (float lf = 1.0; lf < 101.0; lf *= 10.0)
+    for (int size = 1; size <= 6561; size *= 3)
+      {
+	std::unordered_set<int> us1;
+	typedef std::unordered_set<int>::size_type size_type;
+	
+	us1.max_load_factor(10.0);
+
+	for (int i = 0; i < size; ++i)
+	  us1.insert(i);
+
+	us1.max_load_factor(lf);
+
+	for (int i = 1; i <= 6561; i *= 81)
+	  {
+	    const size_type n = size * 81 / i;
+	    us1.rehash(n);
+	    VERIFY( us1.bucket_count() > us1.size() / us1.max_load_factor() );
+	    VERIFY( us1.bucket_count() >= n );
+	  }
+      }
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
Index: testsuite/23_containers/unordered_set/dr1189.cc
===================================================================
--- testsuite/23_containers/unordered_set/dr1189.cc	(revision 163221)
+++ testsuite/23_containers/unordered_set/dr1189.cc	(working copy)
@@ -1,48 +0,0 @@ 
-// { dg-options "-std=gnu++0x" }
-// 2010-03-10  Paolo Carlini  <paolo.carlini@oracle.com>
-//
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_set>
-#include <testsuite_hooks.h>
-
-// DR 1189. Awkward interface for changing the number of buckets
-// in an unordered associative container
-void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
-  std::unordered_set<int> s1;
-  s1.reserve(10);
-  VERIFY( s1.bucket_count() >= 10 );
-
-  s1.reserve(100);
-  VERIFY( s1.bucket_count() >= 100 );
-
-  std::unordered_set<int> s2(100);
-  VERIFY( s2.bucket_count() >= 100 );
-
-  s2.reserve(1000);
-  VERIFY( s2.bucket_count() >= 1000 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}
Index: testsuite/23_containers/unordered_multiset/dr1189.cc
===================================================================
--- testsuite/23_containers/unordered_multiset/dr1189.cc	(revision 163221)
+++ testsuite/23_containers/unordered_multiset/dr1189.cc	(working copy)
@@ -1,48 +0,0 @@ 
-// { dg-options "-std=gnu++0x" }
-// 2010-03-10  Paolo Carlini  <paolo.carlini@oracle.com>
-//
-// Copyright (C) 2010 Free Software Foundation, Inc.
-//
-// This file is part of the GNU ISO C++ Library.  This library is free
-// software; you can redistribute it and/or modify it under the
-// terms of the GNU General Public License as published by the
-// Free Software Foundation; either version 3, or (at your option)
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License along
-// with this library; see the file COPYING3.  If not see
-// <http://www.gnu.org/licenses/>.
-
-#include <unordered_set>
-#include <testsuite_hooks.h>
-
-// DR 1189. Awkward interface for changing the number of buckets
-// in an unordered associative container
-void test01() 
-{ 
-  bool test __attribute__((unused)) = true;
-  
-  std::unordered_multiset<int> ms1;
-  ms1.reserve(10);
-  VERIFY( ms1.bucket_count() >= 10 );
-
-  ms1.reserve(100);
-  VERIFY( ms1.bucket_count() >= 100 );
-
-  std::unordered_multiset<int> ms2(100);
-  VERIFY( ms2.bucket_count() >= 100 );
-
-  ms2.reserve(1000);
-  VERIFY( ms2.bucket_count() >= 1000 );
-}
-
-int main()
-{
-  test01();
-  return 0;
-}