From 5a0727d99003e061b89e016c036947951d0743d2 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Mon, 14 Jan 2013 20:57:58 +0000 Subject: [PATCH] vector.cc: Shrink memory usage under simulator. 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. From-SVN: r195177 --- .../testsuite/23_containers/vector/profile/vector.cc | 8 +++++++- libstdc++-v3/testsuite/26_numerics/valarray/28277.cc | 10 ++++++++-- .../basic_istream/extractors_character/wchar_t/4.cc | 10 ++++++++-- .../testsuite/27_io/basic_istream/getline/wchar_t/5.cc | 10 ++++++++-- .../testsuite/27_io/basic_istream/ignore/wchar_t/2.cc | 10 ++++++++-- .../inserters_character/wchar_t/28277-1.cc | 10 ++++++++-- .../inserters_character/wchar_t/28277-2.cc | 10 ++++++++-- .../27_io/basic_stringbuf/overflow/wchar_t/1.cc | 10 ++++++++-- .../27_io/basic_stringbuf/setbuf/wchar_t/4.cc | 10 ++++++++-- 9 files changed, 71 insertions(+), 17 deletions(-) diff --git a/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc b/libstdc++-v3/testsuite/23_containers/vector/profile/vector.cc index 1e9d01afec5..7806fb24bf3 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 -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2013 Free Software Foundation // // 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 @@ -17,6 +17,12 @@ // with this library; see the file COPYING3. If not see // . +// { 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 2e27c800e8c..58c100d9f8f 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 @@ -1,6 +1,6 @@ // 2005-07-22 Paolo Carlini -// Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2005, 2006, 2007, 2009, 2013 Free Software Foundation // // 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 @@ -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 39fb5957260..0c8a0472623 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2013 Free Software Foundation // // 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 @@ -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 8a24210415d..867b86e33e8 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 @@ -1,4 +1,4 @@ -// Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2004, 2005, 2006, 2007, 2009, 2013 Free Software Foundation // // 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 @@ -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 d2658641d7c..8012f794b40 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 @@ -1,6 +1,6 @@ // 2006-07-15 Paolo Carlini -// Copyright (C) 2006, 2009 Free Software Foundation +// Copyright (C) 2006, 2009, 2013 Free Software Foundation // // 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 @@ -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 6280fa1d71a..94b6b13eda4 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 @@ -1,6 +1,6 @@ // 2006-10-12 Paolo Carlini -// Copyright (C) 2006, 2007, 2009 Free Software Foundation +// Copyright (C) 2006, 2007, 2009, 2013 Free Software Foundation // // 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 @@ -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 0d3ea89e8c6..2b35dbdea18 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 @@ -1,6 +1,6 @@ // 2004-07-07 Paolo Carlini -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2009, 2013 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 @@ -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 c6c966db7d1..4a82d8f5fc7 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 @@ -1,6 +1,6 @@ // 2004-10-06 Paolo Carlini -// Copyright (C) 2004, 2009 Free Software Foundation, Inc. +// Copyright (C) 2004, 2009, 2013 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 @@ -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); -- 2.30.2