From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29511 invoked by alias); 14 Jan 2013 18:40:49 -0000 Received: (qmail 29440 invoked by uid 22791); 14 Jan 2013 18:40:46 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from dns1.mips.com (HELO dns1.mips.com) (12.201.5.69) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jan 2013 18:40:32 +0000 Received: from mailgate1.mips.com (mailgate1.mips.com [12.201.5.111]) by dns1.mips.com (8.13.8/8.13.8) with ESMTP id r0EIeVsN005772; Mon, 14 Jan 2013 10:40:31 -0800 X-M-MSG: Received: from exchdb01.mips.com (unknown [192.168.36.84]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by mailgate1.mips.com (Postfix) with ESMTP id 2DB6236463B; Mon, 14 Jan 2013 10:40:27 -0800 (PST) Received: from ubuntu-sellcey.mips.com (192.168.65.53) by exchhub01.mips.com (192.168.36.84) with Microsoft SMTP Server id 14.2.247.3; Mon, 14 Jan 2013 10:40:26 -0800 Received: by ubuntu-sellcey.mips.com (sSMTP sendmail emulation); Mon, 14 Jan 2013 10:40:26 -0800 From: "Steve Ellcey " Date: Mon, 14 Jan 2013 18:40:00 -0000 To: , Subject: [patch, libstdc++, testsuite] Fix simulator timouts. User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-ID: X-EMS-Proccessed: 6LP3oGfGVdcdb8o1aBnt6w== X-EMS-STAMP: j86JGHM/UjwTxNrCKJ10cQ== Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00725.txt.bz2 Here is a patch for the last of the C++ library tests that fail for me when run under the gnu simulator due to memory usage. I am using the same define mechanism to shrink them when run on a simulator as other tests are already using. Tested on mips-mti-elf target with no regressions. OK to checkin? Steve Ellcey sellcey@mips.com 2013-01-14 Steve Ellcey * testsuite/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc: Shrink memory usage under simulator. * testsuite/libstdc++-v3/testsuite/26_numerics/valarray/28277.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc: Ditto. * testsuite/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc: Ditto. diff --git a/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc b/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc index 1e9d01a..7806fb2 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc @@ -1,6 +1,12 @@ // Test vector: performance difference 25% (0.444s vs 0.539s) // Advice: set tmp as 10000 +// { dg-options "-DITERATIONS=20" { target simulator } } + +#ifndef ITERATIONS +#define ITERATIONS 2000 +#endif + #include using std::vector; @@ -9,7 +15,7 @@ int main() { vector tmp; - for (int j=0; j<2000; j++) + for (int j=0; j. +// { dg-options "-DMAX_SIZE=5000" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 5000000 +#endif + #include #include @@ -25,7 +31,7 @@ void test01() { bool test __attribute__((unused)) = true; - const std::valarray v1(1, 5000000); + const std::valarray v1(1, MAX_SIZE); const std::valarray v2 = v1.shift(1); VERIFY( v2.size() == v1.size() ); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc index 2e27c80..1b94684 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc @@ -19,6 +19,12 @@ // 27.6.1.2.3 basic_istream::operator>> +// { dg-options "-DMAX_SIZE=466" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 666 +#endif + #include #include #include @@ -70,7 +76,7 @@ void test01() const char filename[] = "inserters_extractors-4.txt"; const unsigned nchunks = 10; - const wstring data = prepare(666, nchunks); + const wstring data = prepare(MAX_SIZE, nchunks); wofstream ofstrm; ofstrm.open(filename); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc index 39fb595..cd97df5 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc @@ -17,6 +17,12 @@ // 27.6.1.3 unformatted input functions +// { dg-options "-DMAX_LENGTH=7" { target simulator } } + +#ifndef MAX_LENGTH +#define MAX_LENGTH 777 +#endif + #include #include #include @@ -68,7 +74,7 @@ void test01() const wchar_t delim = L'|'; const unsigned nchunks = 10; - const wstring data = prepare(777, nchunks, delim); + const wstring data = prepare(MAX_LENGTH, nchunks, delim); wofstream ofstrm; ofstrm.open(filename); diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc index 8a24210..519c038 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc @@ -17,6 +17,12 @@ // 27.6.1.3 unformatted input functions +// { dg-options "-DMAX_SIZE=355" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 555 +#endif + #include #include #include @@ -67,7 +73,7 @@ void test01() const wchar_t delim = L'|'; const unsigned nchunks = 10; - const wstring data = prepare(555, nchunks, delim); + const wstring data = prepare(MAX_SIZE, nchunks, delim); wofstream ofstrm; ofstrm.open(filename); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc index d265864..20b2fe6 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-1.cc @@ -19,6 +19,12 @@ // 27.6.2.5.4 basic_ostream character inserters +// { dg-options "-DMAX_SIZE=50000" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 5000000 +#endif + #include #include #include @@ -30,7 +36,7 @@ void test01() bool test __attribute__((unused)) = true; wostringstream oss_01; - const string str_01(5000000, 'a'); + const string str_01(MAX_SIZE, 'a'); oss_01 << str_01.c_str(); diff --git a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc index 6280fa1..cf866fd 100644 --- a/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc +++ b/libstdc++-v3/testsuite/27_io/basic_ostream/inserters_character/wchar_t/28277-2.cc @@ -19,6 +19,12 @@ // 27.6.2.5.4 basic_ostream character inserters +// { dg-options "-DMAX_SIZE=50000" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 5000000 +#endif + #include #include #include @@ -32,7 +38,7 @@ void test01() wostringstream oss_01; const string str_01(50, 'a'); - oss_01.width(5000000); + oss_01.width(MAX_SIZE); const streamsize width = oss_01.width(); oss_01 << str_01.c_str(); diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc index 0d3ea89..d8e831b 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/overflow/wchar_t/1.cc @@ -19,6 +19,12 @@ // 27.7.1.3 basic_stringbuf overridden virtual functions. +// { dg-options "-DMAX_SIZE=100000" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE 10000000 +#endif + #include #include #include @@ -51,6 +57,6 @@ test01(unsigned iter) int main() { - test01(10000000); + test01(MAX_SIZE); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc index c6c966d..ee28071 100644 --- a/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc +++ b/libstdc++-v3/testsuite/27_io/basic_stringbuf/setbuf/wchar_t/4.cc @@ -19,6 +19,12 @@ // 27.8.1.4 Overridden virtual functions +// { dg-options "-DMAX_SIZE=4096" { target simulator } } + +#ifndef MAX_SIZE +#define MAX_SIZE (1 << 18) +#endif + #include #include @@ -27,7 +33,7 @@ void test01() using namespace std; bool test __attribute__((unused)) = true; - const unsigned max_size = 1 << 18; + const unsigned max_size = MAX_SIZE; static wchar_t ref[max_size]; wmemset(ref, L'\0', max_size);