Skip to content

R
riscv-gcc-1
Commit 3234d6b0 by Johannes Singler Committed by Johannes Singler
Options

2008-05-06 Johannes Singler <singler@ira.uka.de> 

        * include/parallel/multiway_merge.h:
          (multiway_merge_*_unguarded):
          Pass sentinel directly, to allow correct determination.
          (multiway_merge_loser_tree_unguarded):
          Remove over-cautious assertion.
          (calls to multiway_merge_*_splitting):
          Parametrize with type that is correct in all cases.
        * include/parallel/losertree.h:
          (delete_min_insert (in many classes)):
          Correct and standardize assertions.

From-SVN: r134977
parent 333d8f61
Showing with 59 additions and 24 deletions
libstdc++-v3/ChangeLog
2008-05-06 Johannes Singler <singler@ira.uka.de>
* include/parallel/multiway_merge.h:
(multiway_merge_*_unguarded):
Pass sentinel directly, to allow correct determination.
(multiway_merge_loser_tree_unguarded):
Remove over-cautious assertion.
(calls to multiway_merge_*_splitting):
Parametrize with type that is correct in all cases.
* include/parallel/losertree.h:
(delete_min_insert (in many classes)):
Correct and standardize assertions.
2008-05-05 Benjamin Kosnik <bkoz@redhat.com> 2008-05-05 Benjamin Kosnik <bkoz@redhat.com>
* testsuite/util/testsuite_visualization.h: Move contents into... * testsuite/util/testsuite_visualization.h: Move contents into...
......
libstdc++-v3/include/parallel/losertree.h
...@@ -220,6 +220,11 @@ public: ...@@ -220,6 +220,11 @@ public:
// Do not pass a const reference since key will be used as local variable. // Do not pass a const reference since key will be used as local variable.
void delete_min_insert(T key, bool sup) void delete_min_insert(T key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
{ {
...@@ -313,8 +318,8 @@ public: ...@@ -313,8 +318,8 @@ public:
delete_min_insert(T key, bool sup) delete_min_insert(T key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// loser trees are only used for at least 2 sequences // no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(_M_log_k > 1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
int source = losers[0].source; int source = losers[0].source;
...@@ -436,6 +441,11 @@ public: ...@@ -436,6 +441,11 @@ public:
void delete_min_insert(const T& key, bool sup) void delete_min_insert(const T& key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
const T* keyp = &key; const T* keyp = &key;
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
...@@ -511,6 +521,11 @@ public: ...@@ -511,6 +521,11 @@ public:
void delete_min_insert(const T& key, bool sup) void delete_min_insert(const T& key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
const T* keyp = &key; const T* keyp = &key;
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
...@@ -569,7 +584,7 @@ public: ...@@ -569,7 +584,7 @@ public:
// Avoid default-constructing losers[].key // Avoid default-constructing losers[].key
losers = static_cast<Loser*>(::operator new(2 * k * sizeof(Loser))); losers = static_cast<Loser*>(::operator new(2 * k * sizeof(Loser)));
for (unsigned int i = /*k + ik - 1*/0; i < (2 * k); ++i) for (unsigned int i = k + ik - 1; i < (2 * k); ++i)
{ {
losers[i].key = _sentinel; losers[i].key = _sentinel;
losers[i].source = -1; losers[i].source = -1;
...@@ -582,8 +597,8 @@ public: ...@@ -582,8 +597,8 @@ public:
inline int inline int
get_min_source() get_min_source()
{ {
// no dummy sequence can ever be at the top!
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
return losers[0].source; return losers[0].source;
...@@ -648,8 +663,8 @@ public: ...@@ -648,8 +663,8 @@ public:
{ {
losers[0] = losers[init_winner(1)]; losers[0] = losers[init_winner(1)];
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
} }
...@@ -658,13 +673,12 @@ public: ...@@ -658,13 +673,12 @@ public:
inline void inline void
delete_min_insert(T key, bool) delete_min_insert(T key, bool)
{ {
// No dummy sequence can ever be at the top and be retrieved!
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
int source = losers[0].source; int source = losers[0].source;
printf("%d\n", source);
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
{ {
// The smaller one gets promoted, ties are broken by source. // The smaller one gets promoted, ties are broken by source.
...@@ -739,8 +753,8 @@ public: ...@@ -739,8 +753,8 @@ public:
{ {
losers[0] = losers[init_winner(1)]; losers[0] = losers[init_winner(1)];
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
} }
...@@ -749,7 +763,11 @@ public: ...@@ -749,7 +763,11 @@ public:
inline void inline void
delete_min_insert(T key, bool) delete_min_insert(T key, bool)
{ {
printf("wrong\n"); #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
{ {
...@@ -785,15 +803,14 @@ protected: ...@@ -785,15 +803,14 @@ protected:
unsigned int ik, k, offset; unsigned int ik, k, offset;
Loser* losers; Loser* losers;
const T sentinel;
Comparator comp; Comparator comp;
public: public:
inline inline
LoserTreePointerUnguardedBase(unsigned int _k, const T _sentinel, LoserTreePointerUnguardedBase(unsigned int _k, const T& _sentinel,
Comparator _comp = std::less<T>()) Comparator _comp = std::less<T>())
: sentinel(_sentinel), comp(_comp) : comp(_comp)
{ {
ik = _k; ik = _k;
...@@ -803,9 +820,9 @@ public: ...@@ -803,9 +820,9 @@ public:
// Avoid default-constructing losers[].key // Avoid default-constructing losers[].key
losers = new Loser[2 * k]; losers = new Loser[2 * k];
for (unsigned int i = /*k + ik - 1*/0; i < (2 * k); ++i) for (unsigned int i = k + ik - 1; i < (2 * k); ++i)
{ {
losers[i].keyp = &sentinel; losers[i].keyp = &_sentinel;
losers[i].source = -1; losers[i].source = -1;
} }
} }
...@@ -816,8 +833,8 @@ public: ...@@ -816,8 +833,8 @@ public:
inline int inline int
get_min_source() get_min_source()
{ {
// no dummy sequence can ever be at the top!
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
return losers[0].source; return losers[0].source;
...@@ -847,7 +864,7 @@ class LoserTreePointerUnguarded : ...@@ -847,7 +864,7 @@ class LoserTreePointerUnguarded :
using Base::losers; using Base::losers;
public: public:
LoserTreePointerUnguarded(unsigned int _k, const T _sentinel, LoserTreePointerUnguarded(unsigned int _k, const T& _sentinel,
Comparator _comp = std::less<T>()) Comparator _comp = std::less<T>())
: Base::LoserTreePointerUnguardedBase(_k, _sentinel, _comp) : Base::LoserTreePointerUnguardedBase(_k, _sentinel, _comp)
{} {}
...@@ -883,8 +900,8 @@ public: ...@@ -883,8 +900,8 @@ public:
{ {
losers[0] = losers[init_winner(1)]; losers[0] = losers[init_winner(1)];
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
} }
...@@ -892,6 +909,11 @@ public: ...@@ -892,6 +909,11 @@ public:
inline void inline void
delete_min_insert(const T& key, bool sup) delete_min_insert(const T& key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
const T* keyp = &key; const T* keyp = &key;
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
...@@ -908,11 +930,6 @@ public: ...@@ -908,11 +930,6 @@ public:
losers[0].source = source; losers[0].source = source;
losers[0].keyp = keyp; losers[0].keyp = keyp;
// no dummy sequence can ever be at the top!
#if _GLIBCXX_ASSERTIONS
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
} }
}; };
...@@ -930,7 +947,7 @@ class LoserTreePointerUnguarded</* stable == */false, T, Comparator> : ...@@ -930,7 +947,7 @@ class LoserTreePointerUnguarded</* stable == */false, T, Comparator> :
using Base::losers; using Base::losers;
public: public:
LoserTreePointerUnguarded(unsigned int _k, const T _sentinel, LoserTreePointerUnguarded(unsigned int _k, const T& _sentinel,
Comparator _comp = std::less<T>()) Comparator _comp = std::less<T>())
: Base::LoserTreePointerUnguardedBase(_k, _sentinel, _comp) : Base::LoserTreePointerUnguardedBase(_k, _sentinel, _comp)
{} {}
...@@ -973,8 +990,8 @@ public: ...@@ -973,8 +990,8 @@ public:
{ {
losers[0] = losers[init_winner(1)]; losers[0] = losers[init_winner(1)];
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
#if _GLIBCXX_ASSERTIONS #if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top at the beginning (0 sequences!)
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1); _GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif #endif
} }
...@@ -982,6 +999,11 @@ public: ...@@ -982,6 +999,11 @@ public:
inline void inline void
delete_min_insert(const T& key, bool sup) delete_min_insert(const T& key, bool sup)
{ {
#if _GLIBCXX_ASSERTIONS
// no dummy sequence can ever be at the top!
_GLIBCXX_PARALLEL_ASSERT(losers[0].source != -1);
#endif
const T* keyp = &key; const T* keyp = &key;
int source = losers[0].source; int source = losers[0].source;
for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2) for (unsigned int pos = (k + source) / 2; pos > 0; pos /= 2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment