[pstl] Move the dummy standard library headers to extra/

[ldionne]

Summary

Alternative to approach suggested in https://reviews.llvm.org/D60537#1473987.

[MikeDvorskiy]

Louis,
thanks for the alternative proposal.

A couple of question:

1. What's motivation to change "stdlib" to "extra"? To avoid some confusing? (because "stdlib" is not a part of the standard library here)
2. Can we keep "pstl" name (instead of proposed "include")? The fact is many people have already use PSTL code (as "third party" headers) and a usage model is following:

#include "pstl/execution"
#include "pstl/algorithm"
#include "pstl/numeric"
#include "pstl/memory"

We would not like to force them changing #include "pstl/execution" to #include "include/execution"

[ldionne]

In D61340#1553136, @MikeDvorskiy wrote:

Louis,
thanks for the alternative proposal.

A couple of question:

1. What's motivation to change "stdlib" to "extra"? To avoid some confusing? (because "stdlib" is not a part of the standard library here)
2. Can we keep "pstl" name (instead of proposed "include")? The fact is many people have already use PSTL code (as "third party" headers) and a usage model is following:

#include "pstl/execution"
#include "pstl/algorithm"
#include "pstl/numeric"
#include "pstl/memory"

We would not like to force them changing #include "pstl/execution" to #include "include/execution"

I don't mind. All I care is that this stuff stays out of the main include directory.

[MikeDvorskiy]

In D61340#1558095, @ldionne wrote:

...

I don't mind. All I care is that this stuff stays out of the main include directory.

So, will you update the patch?

pstl/extra/include -> pstl/stdlib/pstl

pstl/CMakeLists.txt

 endif()
 
 target_include_directories(ParallelSTL
     INTERFACE
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>)
 
 ###############################################################################
-# Setup tests
+# Setup tests and extras
 ###############################################################################
+add_subdirectory(extra)
 enable_testing()
 add_subdirectory(test)
 
 ###############################################################################
 # Install the target and the associated CMake files
 ###############################################################################
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake"

pstl/extra/CMakeLists.txt

+#===-- CMakeLists.txt ----------------------------------------------------===##
+#
+# 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
+#
+#===----------------------------------------------------------------------===##
+
+add_library(test_stdlib INTERFACE)
+target_include_directories(test_stdlib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
+target_link_libraries(test_stdlib INTERFACE pstl::ParallelSTL)

pstl/extra/include/algorithm

 // -*- C++ -*-
 //===-- algorithm ---------------------------------------------------------===//
 //
 // 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 _TEST_SUPPORT_STDLIB_ALGORITHM
-#define _TEST_SUPPORT_STDLIB_ALGORITHM
+#ifndef _PSTL_EXTRA_INCLUDE_ALGORITHM
+#define _PSTL_EXTRA_INCLUDE_ALGORITHM
 
 #include_next <algorithm>
 
 #include <pstl/internal/pstl_config.h>
 
 #if _PSTL_EXECUTION_POLICIES_DEFINED
 // If <execution> has already been included, pull in implementations
 #    include <pstl/internal/glue_algorithm_impl.h>
 #else
 // Otherwise just pull in forward declarations
 #    include <pstl/internal/glue_algorithm_defs.h>
 #    define _PSTL_ALGORITHM_FORWARD_DECLARED 1
 #endif
 
-#endif /* _TEST_SUPPORT_STDLIB_ALGORITHM */
+#endif /* _PSTL_EXTRA_INCLUDE_ALGORITHM */

pstl/extra/include/execution

 // -*- C++ -*-
 //===-- execution ---------------------------------------------------------===//
 //
 // 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 _TEST_SUPPORT_STDLIB_EXECUTION
-#define _TEST_SUPPORT_STDLIB_EXECUTION
+#ifndef _PSTL_EXTRA_INCLUDE_EXECUTION
+#define _PSTL_EXTRA_INCLUDE_EXECUTION
 
 // #include_next <execution> // None of the standard libraries PSTL is built on top have the <execution> header yet.
 
 #include <pstl/internal/pstl_config.h>
 #include <pstl/internal/execution_defs.h>
 
 #define _PSTL_EXECUTION_POLICIES_DEFINED 1
 

 namespace pstl
 {
 namespace execution
 {
 using namespace __pstl::execution;
 }
 } // namespace pstl
 
-#endif /* _TEST_SUPPORT_STDLIB_EXECUTION */
+#endif /* _PSTL_EXTRA_INCLUDE_EXECUTION */

pstl/extra/include/memory

 // -*- C++ -*-
 //===-- memory ------------------------------------------------------------===//
 //
 // 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 _TEST_SUPPORT_STDLIB_MEMORY
-#define _TEST_SUPPORT_STDLIB_MEMORY
+#ifndef _PSTL_EXTRA_INCLUDE_MEMORY
+#define _PSTL_EXTRA_INCLUDE_MEMORY
 
 #include_next <memory>
 
 #include <pstl/internal/pstl_config.h>
 
 #if _PSTL_EXECUTION_POLICIES_DEFINED
 // If <execution> has already been included, pull in implementations
 #    include <pstl/internal/glue_memory_impl.h>
 #else
 // Otherwise just pull in forward declarations
 #    include <pstl/internal/glue_memory_defs.h>
 #    define _PSTL_MEMORY_FORWARD_DECLARED 1
 #endif
 
-#endif /* _TEST_SUPPORT_STDLIB_MEMORY */
+#endif /* _PSTL_EXTRA_INCLUDE_MEMORY */

pstl/extra/include/numeric

 // -*- C++ -*-
 //===-- numeric -----------------------------------------------------------===//
 //
 // 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 _TEST_SUPPORT_STDLIB_NUMERIC
-#define _TEST_SUPPORT_STDLIB_NUMERIC
+#ifndef _PSTL_EXTRA_INCLUDE_NUMERIC
+#define _PSTL_EXTRA_INCLUDE_NUMERIC
 
 #include_next <numeric>
 
 #include <pstl/internal/pstl_config.h>
 
 #if _PSTL_EXECUTION_POLICIES_DEFINED
 // If <execution> has already been included, pull in implementations
 #    include <pstl/internal/glue_numeric_impl.h>
 #else
 // Otherwise just pull in forward declarations
 #    include <pstl/internal/glue_numeric_defs.h>
 #    define _PSTL_NUMERIC_FORWARD_DECLARED 1
 #endif
 
-#endif /* _TEST_SUPPORT_STDLIB_NUMERIC */
+#endif /* _PSTL_EXTRA_INCLUDE_NUMERIC */

pstl/test/CMakeLists.txt

add_custom_target(pstl-build-tests
     COMMENT "Build all the pstl tests.")
 
 add_custom_target(check-pstl
     COMMAND "${CMAKE_CTEST_COMMAND}" --output-on-failure
     USES_TERMINAL
     DEPENDS pstl-build-tests
     COMMENT "Build and run all the unit tests.")
 
-add_library(test_stdlib INTERFACE)
-target_include_directories(test_stdlib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/support/stdlib")
-target_link_libraries(test_stdlib INTERFACE pstl::ParallelSTL)
-
 file(GLOB_RECURSE UNIT_TESTS "*.pass.cpp")
 foreach(_file IN LISTS UNIT_TESTS)
     file(RELATIVE_PATH _target "${CMAKE_CURRENT_SOURCE_DIR}" "${_file}")
     string(REPLACE ".cpp" "" _target "${_target}")
     string(REPLACE "/" "-" _target "${_target}")
     set(_target "pstl-${_target}")
 
     add_executable(${_target} EXCLUDE_FROM_ALL "${_file}")
     target_include_directories(${_target} PRIVATE "${CMAKE_CURRENT_LIST_DIR}")
     target_link_libraries(${_target} PRIVATE test_stdlib)
     set_target_properties(${_target} PROPERTIES CXX_EXTENSIONS NO
                                                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
     add_test(${_target} "${CMAKE_CURRENT_BINARY_DIR}/${_target}")
     add_dependencies(pstl-build-tests ${_target})
 endforeach()