EXSWHTEC-311 - Implement tests for integer type casting intrinsics #285

Change-Id: I6e6bee38dad6948d46ba2ce0d5d2e3b27c150d35


[ROCm/hip-tests commit: f9cf87fe60]

projects/hip-tests/catch/unit/math/math_common.hh

@@ -7,8 +7,15 @@ in the Software without restriction, including without limitation the rights
 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
+<<<<<<< HEAD
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
+=======
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+>>>>>>> c08a2a5d (Merge branch 'develop' into casting_int_tests)
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
@@ -100,7 +107,11 @@ template <typename T, typename... Ts> class MathTest {
   template <bool parallel, typename RT, typename ValidatorBuilder, typename... RTs, size_t... I>
   void RunImpl(const ValidatorBuilder& validator_builder, const size_t grid_dim,
                const size_t block_dim, RT (*const ref_func)(RTs...), const size_t num_args,
+<<<<<<< HEAD
                std::index_sequence<I...> is, const Ts*... xss) {
+=======
+               std::index_sequence<I...>, const Ts*... xss) {
+>>>>>>> c08a2a5d (Merge branch 'develop' into casting_int_tests)
     const auto xss_tup = std::make_tuple(xss...);
 
     constexpr auto f = [](auto dst, auto src, size_t size) {