Merge from upstream

Author: mysterymath

External/HIP/CMakeLists.txt

@@ -70,6 +70,7 @@ macro(create_local_hip_tests VariantSuffix)
   list(APPEND HIP_LOCAL_TESTS with-fopenmp)
   list(APPEND HIP_LOCAL_TESTS saxpy)
   list(APPEND HIP_LOCAL_TESTS memmove)
+  list(APPEND HIP_LOCAL_TESTS memset)
   list(APPEND HIP_LOCAL_TESTS split-kernel-args)
   list(APPEND HIP_LOCAL_TESTS builtin-logb-scalbn)
 

External/HIP/array.hip

@@ -14,7 +14,7 @@
 #include <array>
 #include <assert.h>
 
-#if __cplusplus >= 201402L && STDLIB_VERSION >= 2014
+#if __cplusplus >= 201402L
 // call the function in a constexpr and a non-constexpr context
 #define TEST(expr)                                                             \
   do {                                                                         \
@@ -36,7 +36,7 @@
 MAYBE_CONSTEXPR __host__ __device__ size_t test_array() {
   // Before C++17 only "operator[] const" is constexpr (thus available on
   // device).
-#if __cplusplus < 201703L && STDLIB_VERSION < 2017
+#if __cplusplus < 201703L
   const
 #endif
       std::array<int, 4>
@@ -45,12 +45,12 @@ MAYBE_CONSTEXPR __host__ __device__ size_t test_array() {
   size_t N = A.size();
   assert(N == 4);
 
-#if __cplusplus >= 201402L && STDLIB_VERSION >= 2014
+#if __cplusplus >= 201402L
   int fst = A[0];
   assert(fst == 0);
 #endif
 
-#if __cplusplus >= 201703L && STDLIB_VERSION >= 2017
+#if __cplusplus >= 201703L
   A[0] = 4;
   int snd = A[0];
   assert(snd == 4);

External/HIP/memmove.hip

@@ -1,6 +1,7 @@
 #include <cassert>
 #include <cstring>
 #include <iostream>
+#include <memory>
 #include <vector>
 
 #include "hip/hip_runtime.h"