Modularize <iterator>

.gitignore

@@ -40,3 +40,4 @@ Output/
 compile_commands.json
 *~
 *lit_test_times.txt
+llvm-project/

.upstream-tests/test/std/iterators/iterator.container/data.pass.cpp

@@ -3,10 +3,11 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: c++98, c++03, c++11
 
 // <cuda/std/iterator>
 // template <class C> constexpr auto data(C& c) -> decltype(c.data());               // C++17
@@ -70,6 +71,8 @@ void test_const_array( const T (&array)[Sz] )
     assert ( cuda::std::data(array) == &array[0]);
 }
 
+__device__ static constexpr int arrA [] { 1, 2, 3 };
+
 int main(int, char**)
 {
 #if defined(_LIBCUDACXX_HAS_VECTOR)
@@ -98,7 +101,6 @@ int main(int, char**)
 #endif
 #endif
 
-    static constexpr int arrA [] { 1, 2, 3 };
     test_const_array ( arrA );
 
   return 0;

.upstream-tests/test/std/iterators/iterator.container/empty.array.fail.cpp

@@ -4,6 +4,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.container/empty.container.fail.cpp

@@ -4,6 +4,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.container/empty.initializer_list.fail.cpp

@@ -4,6 +4,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.container/empty.pass.cpp

@@ -3,10 +3,11 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: c++98, c++03, c++11
 
 // <cuda/std/iterator>
 // template <class C> constexpr auto empty(const C& c) -> decltype(c.empty());       // C++17
@@ -44,7 +45,7 @@ template<typename T>
 __host__ __device__
 void test_const_container( const cuda::std::initializer_list<T>& c )
 {
-    assert ( cuda::std::empty(c)   == (c.size() == 0));
+    assert (!cuda::std::empty(c));
 }
 
 template<typename C>
@@ -60,7 +61,7 @@ __host__ __device__
 void test_container( cuda::std::initializer_list<T>& c )
 {
     ASSERT_NOEXCEPT(cuda::std::empty(c));
-    assert ( cuda::std::empty(c)   == (c.size() == 0));
+    assert (!cuda::std::empty(c));
 }
 
 template<typename T, size_t Sz>
@@ -71,6 +72,8 @@ void test_const_array( const T (&array)[Sz] )
     assert (!cuda::std::empty(array));
 }
 
+__device__ static constexpr int arrA [] { 1, 2, 3 };
+
 int main(int, char**)
 {
 #if defined(_LIBCUDACXX_HAS_VECTOR)
@@ -108,7 +111,6 @@ int main(int, char**)
 #endif
 #endif
 
-    static constexpr int arrA [] { 1, 2, 3 };
     test_const_array ( arrA );
 
   return 0;

.upstream-tests/test/std/iterators/iterator.container/size.pass.cpp

@@ -3,10 +3,11 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11, c++14
+// UNSUPPORTED: c++98, c++03, c++11
 
 // <cuda/std/iterator>
 // template <class C> constexpr auto size(const C& c) -> decltype(c.size());         // C++17
@@ -75,6 +76,8 @@ void test_const_array( const T (&array)[Sz] )
     assert ( cuda::std::size(array) == Sz );
 }
 
+__device__ static constexpr int arrA [] { 1, 2, 3 };
+
 int main(int, char**)
 {
 #if defined(_LIBCUDACXX_HAS_VECTOR)
@@ -111,7 +114,6 @@ int main(int, char**)
 #endif
 #endif
 
-    static constexpr int arrA [] { 1, 2, 3 };
     test_const_array ( arrA );
 
   return 0;

.upstream-tests/test/std/iterators/iterator.container/ssize.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
@@ -36,7 +37,7 @@
 struct short_container {
 __host__ __device__
     uint16_t size() const { return 60000; } // not noexcept
-    };
+};
 
 
 template<typename C>
@@ -84,6 +85,8 @@ void test_const_array(const T (&array)[Sz])
     assert ( cuda::std::ssize(array) == Sz );
 }
 
+__device__ static constexpr int arrA [] { 1, 2, 3 };
+
 int main(int, char**)
 {
 #if defined(_LIBCUDACXX_HAS_VECTOR)
@@ -124,7 +127,6 @@ int main(int, char**)
     test_const_container ( sv );
 #endif
 
-    static constexpr int arrA [] { 1, 2, 3 };
     ASSERT_SAME_TYPE(ptrdiff_t, decltype(cuda::std::ssize(arrA)));
     static_assert( cuda::std::is_signed_v<decltype(cuda::std::ssize(arrA))>, "");
     test_const_array ( arrA );
@@ -142,7 +144,9 @@ int main(int, char**)
     static_assert( cuda::std::is_signed_v<                      decltype(cuda::std::ssize(sc))>, "");
     static_assert( cuda::std::numeric_limits<                   decltype(cuda::std::ssize(sc))>::max()  > 60000, "");
     static_assert( cuda::std::numeric_limits<cuda::std::make_signed_t<decltype(cuda::std:: size(sc))>>::max() < 60000, "");
+#ifdef __CUDA_ARCH__
     assert (cuda::std::ssize(sc) == 60000);
+#endif
     LIBCPP_ASSERT_NOT_NOEXCEPT(cuda::std::ssize(sc));
 
   return 0;

.upstream-tests/test/std/iterators/iterator.primitives/iterator.basic/iterator.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.operations/advance.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.operations/next.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.operations/prev.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/const_pointer.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/const_volatile_pointer.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/empty.fail.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/empty.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/iterator.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/pointer.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/iterator.traits/volatile_pointer.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/nothing_to_do.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/std.iterator.tags/bidirectional_iterator_tag.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/std.iterator.tags/forward_iterator_tag.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/std.iterator.tags/input_iterator_tag.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/std.iterator.tags/output_iterator_tag.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.primitives/std.iterator.tags/random_access_iterator_tag.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.range/begin-end.fail.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.range/begin-end.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 
@@ -144,6 +145,11 @@ void test_const_array( const T (&array)[Sz] ) {
 #endif
     }
 
+__device__ static constexpr int arrA [] { 1, 2, 3 };
+#if TEST_STD_VER > 14
+__device__ static constexpr const int c[] = {0,1,2,3,4};
+#endif
+
 int main(int, char**) {
 #if defined(_LIBCUDACXX_HAS_VECTOR)
     cuda::std::vector<int> v; v.push_back(1);
@@ -172,7 +178,6 @@ int main(int, char**) {
     test_const_container ( a, 3 );
     test_const_container ( il, 4 );
 
-    static constexpr int arrA [] { 1, 2, 3 };
     test_const_array ( arrA );
 #if TEST_STD_VER > 11
     constexpr const int *b = cuda::std::cbegin(arrA);
@@ -210,7 +215,6 @@ int main(int, char**) {
     }
 
     {
-        static constexpr const int c[] = {0,1,2,3,4};
 
         static_assert ( *cuda::std::begin(c)   == 0, "" );
         static_assert ( *cuda::std::cbegin(c)  == 0, "" );

.upstream-tests/test/std/iterators/iterator.requirements/bidirectional.iterators/nothing_to_do.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.requirements/forward.iterators/nothing_to_do.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//
 

.upstream-tests/test/std/iterators/iterator.requirements/input.iterators/nothing_to_do.pass.cpp

@@ -3,6 +3,7 @@
 // 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
+// SPDX-FileCopyrightText: Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 //===----------------------------------------------------------------------===//