change SM target to 6.2, that's when fnative-half-type was introduced

[bob80905]

• merge hlsl_intr.h

clang/lib/Headers/hlsl/hlsl_intrinsics.h

 //===----- hlsl_intrinsics.h - HLSL definitions for intrinsics ----------===//
 //
 // 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 _HLSL_HLSL_INTRINSICS_H_
 #define _HLSL_HLSL_INTRINSICS_H_
 
 __attribute__((availability(shadermodel, introduced = 6.0)))
 __attribute__((clang_builtin_alias(__builtin_hlsl_wave_active_count_bits))) uint
 WaveActiveCountBits(bool bBit);
 
-<<<<<<< HEAD
-=======
+
 // abs builtins
 __attribute__((clang_builtin_alias(__builtin_abs))) int abs(int In);
 __attribute__((clang_builtin_alias(__builtin_labs))) int64_t abs(int64_t In);
 __attribute__((clang_builtin_alias(__builtin_fabsf))) float abs(float In);
 __attribute__((clang_builtin_alias(__builtin_fabs))) double abs(double In);
 
->>>>>>> cb3f11ce6110 ([HLSL] add sqrt library function)
 #ifdef __HLSL_ENABLE_16_BIT
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 int16_t abs(int16_t);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 int16_t2 abs(int16_t2);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 int16_t3 abs(int16_t3);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 int16_t4 abs(int16_t4);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) half abs(half);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 half2 abs(half2);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 half3 abs(half3);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 half4 abs(half4);
 #endif
 
-<<<<<<< HEAD
+
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int abs(int);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int2 abs(int2);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int3 abs(int3);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int4 abs(int4);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) float
 abs(float);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 float2 abs(float2);

 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) double
 abs(double);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 double2 abs(double2);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 double3 abs(double3);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 double4 abs(double4);
-=======
+
 // sqrt builtins
 __attribute__((clang_builtin_alias(__builtin_sqrt))) double sqrt(double In);
 __attribute__((clang_builtin_alias(__builtin_sqrtf))) float sqrt(float In);
 
 #ifdef __HLSL_ENABLE_16_BIT
 __attribute__((clang_builtin_alias(__builtin_sqrtf16))) half sqrt(half In);
 #endif
->>>>>>> cb3f11ce6110 ([HLSL] add sqrt library function)
+
 
 #endif //_HLSL_HLSL_INTRINSICS_H_

clang/test/CodeGenHLSL/builtins/sqrt.hlsl

 // RUN: %clang_cc1 -std=hlsl2021 -finclude-default-header -x hlsl -triple \
-// RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
+// RUN:   dxil-pc-shadermodel6.2-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 // RUN: %clang_cc1 -std=hlsl2021 -finclude-default-header -x hlsl -triple \
-// RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
+// RUN:   dxil-pc-shadermodel6.2-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefix=NO_HALF
 
 double sqrt_d(double x)
 {
   return sqrt(x);
 }
 
 // CHECK: define noundef double @"?sqrt_d@@YANN@Z"(

 {
   return sqrt(x);
 }
 
 // CHECK: define noundef half @"?sqrt_h@@YA$f16@$f16@@Z"(
 // CHECK: call half @llvm.sqrt.f16(half %0)
 // NO_HALF: define noundef float @"?sqrt_h@@YA$halff@$halff@@Z"(
 // NO_HALF: call float @llvm.sqrt.f32(float %0)
 No newline at end of file