remove compat overloads and corresponding tests, remove templates in hlsl_intrinsics.h

Author: kmpeng

clang/lib/Headers/hlsl/hlsl_compat_overloads.h

@@ -280,17 +280,6 @@ constexpr bool4 isinf(double4 V) { return isinf((float4)V); }
 _DXC_COMPAT_TERNARY_DOUBLE_OVERLOADS(lerp)
 _DXC_COMPAT_TERNARY_INTEGER_OVERLOADS(lerp)
 
-//===----------------------------------------------------------------------===//
-// lit builtins overloads
-//===----------------------------------------------------------------------===//
-
-template <typename T>
-const inline __detail::enable_if_t<__detail::is_arithmetic<T>::Value,
-                                   vector<T, 4>>
-lit(T NDotL, T NDotH, T M) {
-  return lit<float>((float)NDotL, (float)NDotH, (float)M);
-}
-
 //===----------------------------------------------------------------------===//
 // log builtins overloads
 //===----------------------------------------------------------------------===//

clang/lib/Headers/hlsl/hlsl_intrinsics.h

@@ -283,18 +283,12 @@ const inline float length(__detail::HLSL_FIXED_VECTOR<float, N> X) {
 /// This function returns a lighting coefficient vector (ambient, diffuse,
 /// specular, 1).
 
-#if __HLSL_VERSION >= __HLSL_202y
-template <typename T> const inline vector<T, 4> lit(T, T, T) = delete;
-#endif
-
-template <>
 _HLSL_16BIT_AVAILABILITY(shadermodel, 6.2)
-const inline vector<half, 4> lit<half>(half NDotL, half NDotH, half M) {
+const inline half4 lit(half NDotL, half NDotH, half M) {
   return __detail::lit_impl(NDotL, NDotH, M);
 }
 
-template <>
-const inline vector<float, 4> lit<float>(float NDotL, float NDotH, float M) {
+const inline float4 lit(float NDotL, float NDotH, float M) {
   return __detail::lit_impl(NDotL, NDotH, M);
 }
 

clang/test/CodeGenHLSL/builtins/lit-overloads.hlsl

@@ -1,31 +1,16 @@
-// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify
+// RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
-float4 test_no_second_arg(float p0) {
-  return lit(p0);
-  // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 1 was provided}}
-}
-
-float4 test_no_third_arg(float p0) {
-  return lit(p0, p0);
-  // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 2 were provided}}
-}
-
-float4 test_too_many_arg(float p0) {
-  return lit(p0, p0, p0, p0);
-  // expected-error@-1 {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate function template not viable: requires 3 arguments, but 4 were provided}}
+float4 test_double_inputs(double p0, double p1, double p2) {
+  return lit(p0, p1, p2);
+  // expected-error@-1 {{call to 'lit' is ambiguous}}
 }
 
-float4 test_vec_inputs(float2 p0, float2 p1, float2 p2) {
+float4 test_int_inputs(int p0, int p1, int p2) {
   return lit(p0, p1, p2);
-  // expected-error@-1  {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate template ignored: substitution failure [with T = float2]: invalid vector element type 'vector<float, 2>' (vector of 2 'float' values)}}
+  // expected-error@-1 {{call to 'lit' is ambiguous}}
 }
 
-float4 test_vec1_inputs(float1 p0, float1 p1, float1 p2) {
+float4 test_bool_inputs(bool p0, bool p1, bool p2) {
   return lit(p0, p1, p2);
-  // expected-error@-1  {{no matching function for call to 'lit'}}
-  // expected-note@hlsl/hlsl_compat_overloads.h:* {{candidate template ignored: substitution failure [with T = float1]: invalid vector element type 'vector<float, 1>' (vector of 1 'float' value)}}
+  // expected-error@-1 {{call to 'lit' is ambiguous}}
 }