[pstl] Fix header inclusion order failures

[rodgert]

Summary

See https://bugs.llvm.org/show_bug.cgi?id=41432

[MikeDvorskiy]

I have no objections in general..
But let add the line

std::cout << done() << std::endl;

before return 0;

1. our test system searching for a special marker in a log - "done" or "passed"; otherwise a test is failed.
2. to be consistent with the rest test units.

[ldionne]

In D60525#1462345, @MikeDvorskiy wrote:

I have no objections in general..
But let add the line

std::cout << done() << std::endl;

before return 0;

1. our test system searching for a special marker in a log - "done" or "passed"; otherwise a test is failed.
2. to be consistent with the rest test units.

Would it be possible to have your test system check for a non-zero exit code as a failure indication? This is that CMake and lit use, and we're not going to keep all these cout calls there forever.

[MikeDvorskiy]

Eventually, I tend to that keeping "cout" code is redundant , just "return 0" is enough.
We will try to re-config our test system to accept just returning zero;

[ldionne]

In D60525#1462803, @MikeDvorskiy wrote:

Eventually, I tend to that keeping "cout" code is redundant , just "return 0" is enough.
We will try to re-config our test system to accept just returning zero;

That would be great! Another nice side effect of this is that we could stop using <iostreams> everywhere, which is both not really in line with the rest of the libc++ test suite, and also extremely costly in terms of compilation time. I'm sure you've noticed that the tests were not exactly fast to compile :-).

pstl/trunk/include/pstl/internal/glue_algorithm_defs.h

 // -*- C++ -*-
 //===-- glue_algorithm_defs.h ---------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef __PSTL_glue_algorithm_defs_H
 #define __PSTL_glue_algorithm_defs_H
 
 #include <functional>
+#include <iterator>
 
 #include "execution_defs.h"
 
 namespace std
 {
 
 // [alg.any_of]
 

pstl/trunk/include/pstl/internal/glue_algorithm_impl.h

 
 #include <functional>
 
 #include "execution_defs.h"
 #include "utils.h"
 #include "algorithm_fwd.h"
 #include "numeric_fwd.h" /* count and count_if use __pattern_transform_reduce */
 
+#include "execution_impl.h"
+
 namespace std
 {
 
 // [alg.any_of]
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Predicate>
 __pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, bool>
 any_of(_ExecutionPolicy&& __exec, _ForwardIterator __first, _ForwardIterator __last, _Predicate __pred)

pstl/trunk/include/pstl/internal/glue_memory_impl.h

 // -*- C++ -*-
 //===-- glue_memory_impl.h ------------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef __PSTL_glue_memory_impl_H
 #define __PSTL_glue_memory_impl_H
 
+#include "execution_defs.h"
 #include "utils.h"
 #include "algorithm_fwd.h"
 
+#include "execution_impl.h"
+
 namespace std
 {
 
 // [uninitialized.copy]
 
 template <class _ExecutionPolicy, class _InputIterator, class _ForwardIterator>
 __pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _ForwardIterator>
 uninitialized_copy(_ExecutionPolicy&& __exec, _InputIterator __first, _InputIterator __last, _ForwardIterator __result)

pstl/trunk/include/pstl/internal/glue_numeric_defs.h

 // -*- C++ -*-
 //===-- glue_numeric_defs.h -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef __PSTL_glue_numeric_defs_H
 #define __PSTL_glue_numeric_defs_H
 
+#include <iterator>
+
 #include "execution_defs.h"
 
 namespace std
 {
 // [reduce]
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation>
 __pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp>

pstl/trunk/include/pstl/internal/glue_numeric_impl.h

 // -*- C++ -*-
 //===-- glue_numeric_impl.h -----------------------------------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef __PSTL_glue_numeric_impl_H
 #define __PSTL_glue_numeric_impl_H
 
 #include <functional>
 
 #include "utils.h"
 #include "numeric_fwd.h"
+#include "execution_impl.h"
 
 namespace std
 {
 
 // [reduce]
 
 template <class _ExecutionPolicy, class _ForwardIterator, class _Tp, class _BinaryOperation>
 __pstl::__internal::__enable_if_execution_policy<_ExecutionPolicy, _Tp>

pstl/trunk/test/pstl/header_inclusion_order_algorithm_0.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_algorithm_0.pass.cpp -----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/execution"
+#include "pstl/algorithm"
+#else
+#include <execution>
+#include <algorithm>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}

pstl/trunk/test/pstl/header_inclusion_order_algorithm_1.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_algorithm_1.pass.cpp -----------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/algorithm"
+#include "pstl/execution"
+#else
+#include <algorithm>
+#include <execution>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}

pstl/trunk/test/pstl/header_inclusion_order_memory_0.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_memory_0.pass.cpp --------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/execution"
+#include "pstl/memory"
+#else
+#include <execution>
+#include <memory>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}

pstl/trunk/test/pstl/header_inclusion_order_memory_1.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_memory_1.pass.cpp --------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/memory"
+#include "pstl/execution"
+#else
+#include <memory>
+#include <execution>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}

pstl/trunk/test/pstl/header_inclusion_order_numeric_0.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_numeric_0.pass.cpp -------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/execution"
+#include "pstl/numeric"
+#else
+#include <execution>
+#include <numeric>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}

pstl/trunk/test/pstl/header_inclusion_order_numeric_1.pass.cpp

+// -*- C++ -*-
+//===-- header_inclusion_order_numeric_0.pass.cpp -------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "support/pstl_test_config.h"
+
+#ifdef PSTL_STANDALONE_TESTS
+#include "pstl/numeric"
+#include "pstl/execution"
+#else
+#include <numeric>
+#include <execution>
+#endif // PSTL_STANDALONE_TESTS
+
+int32_t
+main()
+{
+    return 0;
+}