diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -308,5 +308,65 @@
 __attribute__((clang_builtin_alias(__builtin_elementwise_log10)))
 double4 log10(double4);
 
+// max builtins
+#ifdef __HLSL_ENABLE_16_BIT
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+half max(half, half);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+half2 max(half2, half2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+half3 max(half3, half3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+half4 max(half4, half4);
+#endif
+
+__attribute__((clang_builtin_alias(__builtin_elementwise_max))) float
+max(float, float);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+float2 max(float2, float2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+float3 max(float3, float3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+float4 max(float4, float4);
+
+__attribute__((clang_builtin_alias(__builtin_elementwise_max))) double
+max(double, double);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+double2 max(double2, double2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+double3 max(double3, double3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_max)))
+double4 max(double4, double4);
+
+// min builtins
+#ifdef __HLSL_ENABLE_16_BIT
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+half min(half, half);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+half2 min(half2, half2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+half3 min(half3, half3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+half4 min(half4, half4);
+#endif
+
+__attribute__((clang_builtin_alias(__builtin_elementwise_min))) float
+min(float, float);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+float2 min(float2, float2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+float3 min(float3, float3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+float4 min(float4, float4);
+
+__attribute__((clang_builtin_alias(__builtin_elementwise_min))) double
+min(double, double);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+double2 min(double2, double2);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+double3 min(double3, double3);
+__attribute__((clang_builtin_alias(__builtin_elementwise_min)))
+double4 min(double4, double4);
+
 } // namespace hlsl
 #endif //_HLSL_HLSL_INTRINSICS_H_
diff --git a/clang/test/CodeGenHLSL/builtins/max.hlsl b/clang/test/CodeGenHLSL/builtins/max.hlsl
new file mode 100644
--- /dev/null
+++ b/clang/test/CodeGenHLSL/builtins/max.hlsl
@@ -0,0 +1,56 @@
+// RUN: %clang_cc1 -std=hlsl2021 -finclude-default-header -x hlsl -triple \
+// RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
+// RUN:   -emit-llvm -disable-llvm-passes -O3 -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:   -D__HLSL_ENABLE_16_BIT -o - | FileCheck %s --check-prefix=NO_HALF
+
+// CHECK: define noundef half @
+// CHECK: call half @llvm.maxnum.f16(
+// NO_HALF: define noundef float @"?test_max_half@@YA$halff@$halff@0@Z"(
+// NO_HALF: call float @llvm.maxnum.f32(
+half test_max_half ( half p0, half p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <2 x half> @
+// CHECK: call <2 x half> @llvm.maxnum.v2f16
+// NO_HALF: define noundef <2 x float> @"?test_max_float2@@YAT?$__vector@M$01@__clang@@T12@0@Z"(
+// NO_HALF: call <2 x float> @llvm.maxnum.v2f32(
+half2 test_max_half2 ( half2 p0, half2 p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <3 x half> @
+// CHECK: call <3 x half> @llvm.maxnum.v3f16
+// NO_HALF: define noundef <3 x float> @"?test_max_float3@@YAT?$__vector@M$02@__clang@@T12@0@Z"(
+// NO_HALF: call <3 x float> @llvm.maxnum.v3f32(
+half3 test_max_half3 ( half3 p0, half3 p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <4 x half> @
+// CHECK: call <4 x half> @llvm.maxnum.v4f16
+// NO_HALF: define noundef <4 x float> @"?test_max_float4@@YAT?$__vector@M$03@__clang@@T12@0@Z"(
+// NO_HALF: call <4 x float> @llvm.maxnum.v4f32(
+half4 test_max_half4 ( half4 p0, half4 p1 ) {
+  return max ( p0, p1 );
+}
+
+// CHECK: define noundef float @
+// CHECK: call float @llvm.maxnum.f32(
+float test_max_float ( float p0, float p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <2 x float> @
+// CHECK: call <2 x float> @llvm.maxnum.v2f32
+float2 test_max_float2 ( float2 p0, float2 p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <3 x float> @
+// CHECK: call <3 x float> @llvm.maxnum.v3f32
+float3 test_max_float3 ( float3 p0, float3 p1 ) {
+  return max ( p0, p1 );
+}
+// CHECK: define noundef <4 x float> @
+// CHECK: call <4 x float> @llvm.maxnum.v4f32
+float4 test_max_float4 ( float4 p0, float4 p1) {
+  return max ( p0, p1 );
+}
diff --git a/clang/test/CodeGenHLSL/builtins/min.hlsl b/clang/test/CodeGenHLSL/builtins/min.hlsl
new file mode 100644
--- /dev/null
+++ b/clang/test/CodeGenHLSL/builtins/min.hlsl
@@ -0,0 +1,56 @@
+// RUN: %clang_cc1 -std=hlsl2021 -finclude-default-header -x hlsl -triple \
+// RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
+// RUN:   -emit-llvm -disable-llvm-passes -O3 -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:   -D__HLSL_ENABLE_16_BIT -o - | FileCheck %s --check-prefix=NO_HALF
+
+// CHECK: define noundef half @
+// CHECK: call half @llvm.minnum.f16(
+// NO_HALF: define noundef float @"?test_min_half@@YA$halff@$halff@0@Z"(
+// NO_HALF: call float @llvm.minnum.f32(
+half test_min_half ( half p0, half p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <2 x half> @
+// CHECK: call <2 x half> @llvm.minnum.v2f16
+// NO_HALF: define noundef <2 x float> @"?test_min_float2@@YAT?$__vector@M$01@__clang@@T12@0@Z"(
+// NO_HALF: call <2 x float> @llvm.minnum.v2f32(
+half2 test_min_half2 ( half2 p0, half2 p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <3 x half> @
+// CHECK: call <3 x half> @llvm.minnum.v3f16
+// NO_HALF: define noundef <3 x float> @"?test_min_float3@@YAT?$__vector@M$02@__clang@@T12@0@Z"(
+// NO_HALF: call <3 x float> @llvm.minnum.v3f32(
+half3 test_min_half3 ( half3 p0, half3 p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <4 x half> @
+// CHECK: call <4 x half> @llvm.minnum.v4f16
+// NO_HALF: define noundef <4 x float> @"?test_min_float4@@YAT?$__vector@M$03@__clang@@T12@0@Z"(
+// NO_HALF: call <4 x float> @llvm.minnum.v4f32(
+half4 test_min_half4 ( half4 p0, half4 p1 ) {
+  return min ( p0, p1 );
+}
+
+// CHECK: define noundef float @
+// CHECK: call float @llvm.minnum.f32(
+float test_min_float ( float p0, float p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <2 x float> @
+// CHECK: call <2 x float> @llvm.minnum.v2f32
+float2 test_min_float2 ( float2 p0, float2 p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <3 x float> @
+// CHECK: call <3 x float> @llvm.minnum.v3f32
+float3 test_min_float3 ( float3 p0, float3 p1 ) {
+  return min ( p0, p1 );
+}
+// CHECK: define noundef <4 x float> @
+// CHECK: call <4 x float> @llvm.minnum.v4f32
+float4 test_min_float4 ( float4 p0, float4 p1) {
+  return min ( p0, p1 );
+}