[clang] [HLSL] do not emit using directive if hlsl 202x and later (PR #241633)

Sarah Spall via cfe-commits cfe-commits at lists.llvm.org
Thu Nov 12 11:59:55 PST 2026


https://github.com/spall updated https://github.com/llvm/llvm-project/pull/241633

>From f809b2999fa57ae8ea78f9d8978075d4dc34306f Mon Sep 17 00:00:00 2001
From: Sarah Spall <sarahspall at microsoft.com>
Date: Wed, 11 Nov 2026 17:59:57 -0800
Subject: [PATCH 1/4] do not emit using directive if hlsl 202x and later +
 updated tests + add new test

---
 clang/lib/Sema/HLSLExternalSemaSource.cpp        |  9 +++++----
 clang/test/AST/ByteCode/hlsl.hlsl                |  2 ++
 clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl  |  2 ++
 clang/test/AST/HLSL/ConstantBuffers-AST.hlsl     |  2 ++
 clang/test/AST/HLSL/DynamicResources-AST.hlsl    |  2 ++
 clang/test/AST/HLSL/Inputs/pch.hlsl              |  2 +-
 clang/test/AST/HLSL/Inputs/pch_spirv_type.hlsl   |  2 +-
 clang/test/AST/HLSL/Inputs/pch_with_buf.hlsl     |  2 +-
 .../test/AST/HLSL/MultiSampledTextures-AST.hlsl  |  2 ++
 clang/test/AST/HLSL/OutArgExpr.hlsl              |  2 ++
 clang/test/AST/HLSL/PackedStruct.hlsl            |  2 ++
 clang/test/AST/HLSL/StructuredBuffers-AST.hlsl   |  2 ++
 clang/test/AST/HLSL/Textures-AST.hlsl            |  2 ++
 clang/test/AST/HLSL/Textures-scalar-AST.hlsl     |  2 ++
 clang/test/AST/HLSL/Textures-shorthand-AST.hlsl  |  2 ++
 clang/test/AST/HLSL/Textures-vector-AST.hlsl     |  2 ++
 clang/test/AST/HLSL/TypdefArrayParam.hlsl        |  2 ++
 clang/test/AST/HLSL/TypedBuffers-AST.hlsl        |  2 ++
 clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl |  2 ++
 clang/test/AST/HLSL/ast-dump-SpirvType.hlsl      | 16 +++++++++-------
 clang/test/AST/HLSL/cbuffer.hlsl                 |  2 ++
 clang/test/AST/HLSL/default_cbuffer.hlsl         |  2 ++
 .../test/AST/HLSL/implicit-using-namespace.hlsl  |  9 +++++++++
 ...ured_resource_element_compatible_concept.hlsl |  2 ++
 ...yped_resource_element_compatible_concept.hlsl |  2 ++
 clang/test/AST/HLSL/matrix-alias.hlsl            | 12 +++++++-----
 .../HLSL/matrix-elementexpr-tree-transform.hlsl  |  2 ++
 .../AST/HLSL/matrix-init-list-row-major.hlsl     |  2 ++
 .../AST/HLSL/matrix-single-subscript-getter.hlsl |  2 ++
 clang/test/AST/HLSL/matrix_layout_attr.hlsl      |  2 ++
 clang/test/AST/HLSL/packoffset.hlsl              |  2 ++
 clang/test/AST/HLSL/pch.hlsl                     |  2 ++
 clang/test/AST/HLSL/pch_spirv_type.hlsl          |  4 +++-
 clang/test/AST/HLSL/pch_with_buf.hlsl            |  2 ++
 .../HLSL/pch_with_matrix_element_accessor.hlsl   |  2 ++
 .../HLSL/pch_with_matrix_single_subscript.hlsl   |  2 ++
 clang/test/AST/HLSL/private.hlsl                 |  2 ++
 clang/test/AST/HLSL/resource_binding_attr.hlsl   |  2 ++
 .../AST/HLSL/resources-in-structs-errors.hlsl    |  2 ++
 .../HLSL/resources-in-structs-method-call.hlsl   |  2 ++
 clang/test/AST/HLSL/resources-in-structs.hlsl    |  2 ++
 clang/test/AST/HLSL/semantic-input.hlsl          |  2 ++
 clang/test/AST/HLSL/semantic-output.hlsl         |  2 ++
 clang/test/AST/HLSL/vector-alias.hlsl            |  2 ++
 clang/test/AST/HLSL/vk.spec-constant.usage.hlsl  |  2 ++
 clang/test/AST/HLSL/vk_binding_attr.hlsl         |  2 ++
 clang/test/CodeGenHLSL/ArrayAssignable.hlsl      |  2 ++
 .../CodeGenHLSL/ArrayAssignable.logicalptr.hlsl  |  2 ++
 .../BasicFeatures/AggregateSplatCast.hlsl        |  2 ++
 .../BasicFeatures/ArrayElementwiseCast.hlsl      |  2 ++
 .../BasicFeatures/ArrayOutputArguments.hlsl      |  2 ++
 .../CodeGenHLSL/BasicFeatures/InitLists.hlsl     |  2 ++
 .../BasicFeatures/MatrixComparisonOperators.hlsl |  2 ++
 .../BasicFeatures/MatrixConstructor.hlsl         |  2 ++
 .../BasicFeatures/MatrixElementRowColFlags.hlsl  |  2 ++
 .../BasicFeatures/MatrixElementTypeCast.hlsl     |  2 ++
 .../BasicFeatures/MatrixExplicitTruncation.hlsl  |  2 ++
 .../BasicFeatures/MatrixImplicitTruncation.hlsl  |  2 ++
 .../MatrixInitializerListOrder.hlsl              |  2 ++
 .../MatrixSingleSubscriptConstSwizzle.hlsl       |  2 ++
 .../MatrixSingleSubscriptDynamicSwizzle.hlsl     |  2 ++
 .../MatrixSingleSubscriptGetter.hlsl             |  2 ++
 .../MatrixSingleSubscriptSetter.hlsl             |  2 ++
 .../CodeGenHLSL/BasicFeatures/MatrixSplat.hlsl   |  2 ++
 .../MatrixToAndFromVectorConstructors.hlsl       |  2 ++
 .../BasicFeatures/OutputArguments.hlsl           |  2 ++
 .../BasicFeatures/StructElementwiseCast.hlsl     |  2 ++
 .../BasicFeatures/VectorElementwiseCast.hlsl     |  2 ++
 .../CodeGenHLSL/BasicFeatures/frem_modulo.hlsl   |  2 ++
 .../BasicFeatures/matrix-type-indexing.hlsl      |  2 ++
 .../standard_conversion_sequences.hlsl           |  2 ++
 clang/test/CodeGenHLSL/BoolMatrix.hlsl           |  2 ++
 clang/test/CodeGenHLSL/BoolVector.hlsl           |  2 ++
 clang/test/CodeGenHLSL/GlobalConstructorLib.hlsl |  2 ++
 clang/test/CodeGenHLSL/GlobalConstructors.hlsl   |  2 ++
 .../Operators/half-vector-comparisons.hlsl       |  2 ++
 .../test/CodeGenHLSL/Operators/logical-not.hlsl  |  2 ++
 clang/test/CodeGenHLSL/bool-vector-load.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/AddUint64.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/AllMemoryBarrier.hlsl   |  2 ++
 .../builtins/AllMemoryBarrierWithGroupSync.hlsl  |  2 ++
 .../CodeGenHLSL/builtins/Barrier-all-memory.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/Barrier.hlsl     |  2 ++
 .../builtins/ConstantBuffer-layout.hlsl          |  2 ++
 .../CodeGenHLSL/builtins/ConstantBuffer.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/D3DCOLORtoUBYTE4.hlsl   |  2 ++
 .../builtins/DeviceMemoryBarrier.hlsl            |  2 ++
 .../DeviceMemoryBarrierWithGroupSync.hlsl        |  2 ++
 .../CodeGenHLSL/builtins/GroupMemoryBarrier.hlsl |  2 ++
 .../GroupMemoryBarrierWithGroupSync.hlsl         |  2 ++
 .../builtins/InterlockedVectorElement.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/QuadAll.hlsl     |  2 ++
 .../builtins/QuadReadAcrossDiagonal.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/QuadReadAcrossX.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/QuadReadAcrossY.hlsl    |  2 ++
 .../builtins/RWBuffer-Interlocked.hlsl           |  2 ++
 .../RWByteAddressBuffer-InterlockedAdd.hlsl      |  2 ++
 .../RWByteAddressBuffer-InterlockedAnd.hlsl      |  2 ++
 ...AddressBuffer-InterlockedCompareExchange.hlsl |  2 ++
 ...r-InterlockedCompareExchangeFloatBitwise.hlsl |  2 ++
 ...yteAddressBuffer-InterlockedCompareStore.hlsl |  2 ++
 ...ffer-InterlockedCompareStoreFloatBitwise.hlsl |  2 ++
 .../RWByteAddressBuffer-InterlockedExchange.hlsl |  2 ++
 .../RWByteAddressBuffer-InterlockedMax.hlsl      |  2 ++
 .../RWByteAddressBuffer-InterlockedMin.hlsl      |  2 ++
 .../RWByteAddressBuffer-InterlockedOr.hlsl       |  2 ++
 .../RWByteAddressBuffer-InterlockedXor.hlsl      |  2 ++
 .../builtins/RWTexture-Interlocked.hlsl          |  2 ++
 ...rOrderedByteAddressBuffer-InterlockedAdd.hlsl |  2 ++
 ...rOrderedByteAddressBuffer-InterlockedAnd.hlsl |  2 ++
 ...AddressBuffer-InterlockedCompareExchange.hlsl |  2 ++
 ...r-InterlockedCompareExchangeFloatBitwise.hlsl |  2 ++
 ...yteAddressBuffer-InterlockedCompareStore.hlsl |  2 ++
 ...ffer-InterlockedCompareStoreFloatBitwise.hlsl |  2 ++
 ...redByteAddressBuffer-InterlockedExchange.hlsl |  2 ++
 ...rOrderedByteAddressBuffer-InterlockedMax.hlsl |  2 ++
 ...rOrderedByteAddressBuffer-InterlockedMin.hlsl |  2 ++
 ...erOrderedByteAddressBuffer-InterlockedOr.hlsl |  2 ++
 ...rOrderedByteAddressBuffer-InterlockedXor.hlsl |  2 ++
 .../CodeGenHLSL/builtins/VectorElementStore.hlsl |  2 ++
 .../CodeGenHLSL/builtins/VectorSwizzles.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/WaveActiveAllTrue.hlsl  |  2 ++
 .../CodeGenHLSL/builtins/WaveActiveAnyTrue.hlsl  |  2 ++
 .../CodeGenHLSL/builtins/WaveActiveBallot.hlsl   |  2 ++
 .../builtins/WaveActiveBitAnd-errors.hlsl        |  2 ++
 .../builtins/WaveActiveBitXor-errors.hlsl        |  2 ++
 .../builtins/WaveMultiPrefixBitAnd.hlsl          |  2 ++
 .../builtins/WaveMultiPrefixBitOr.hlsl           |  2 ++
 .../builtins/WaveMultiPrefixBitXor.hlsl          |  2 ++
 .../builtins/WaveMultiPrefixCountBits.hlsl       |  2 ++
 .../builtins/WaveMultiPrefixProduct.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/WaveMultiPrefixSum.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/abs.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/abs_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/acos-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/acos.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/acos_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/all.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/and.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/and_mat.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/any.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/asdouble.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/asfloat.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/asfloat_mat.hlsl |  2 ++
 .../CodeGenHLSL/builtins/asin-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/asin.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/asin_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/asint.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/asint16.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/asint_mat.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/asuint.hlsl      |  2 ++
 clang/test/CodeGenHLSL/builtins/asuint16.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/asuint_mat.hlsl  |  2 ++
 .../CodeGenHLSL/builtins/atan-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/atan.hlsl        |  2 ++
 .../CodeGenHLSL/builtins/atan2-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/atan2.hlsl       |  2 ++
 .../builtins/atan2_mat-overloads.hlsl            |  2 ++
 clang/test/CodeGenHLSL/builtins/atan2_mat.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/atan_mat.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/ceil-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/ceil.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/ceil_mat.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/clamp-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/clamp.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/clip.hlsl        |  2 ++
 .../test/CodeGenHLSL/builtins/cos-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/cos.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/cos_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/cosh-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/cosh.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/cosh_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/cross.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/ddx-coarse.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/ddx-fine.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/ddx.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/ddy-coarse.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/ddy-fine.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/ddy.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/degrees-overloads.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/degrees.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/degrees_mat.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/distance.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/dot.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/dot2add.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/dot4add_i8packed.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/dot4add_u8packed.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/dst.hlsl         |  2 ++
 .../test/CodeGenHLSL/builtins/exp-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/exp.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/exp2-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/exp2.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/exp2_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/exp_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/f16tof32-builtin.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/f16tof32.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/f32tof16-builtin.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/f32tof16.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/faceforward.hlsl |  2 ++
 .../test/CodeGenHLSL/builtins/firstbithigh.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/firstbitlow.hlsl |  2 ++
 .../CodeGenHLSL/builtins/floor-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/floor.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/floor_mat.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/fma.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/fmod.hlsl        |  2 ++
 .../CodeGenHLSL/builtins/frac-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/frac.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/frac_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/fwidth.hlsl      |  2 ++
 .../CodeGenHLSL/builtins/hlsl_resource_t.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/isfinite-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/isfinite.hlsl    |  2 ++
 .../builtins/isfinite_mat-overloads.hlsl         |  2 ++
 .../test/CodeGenHLSL/builtins/isfinite_mat.hlsl  |  2 ++
 .../CodeGenHLSL/builtins/isinf-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/isinf.hlsl       |  2 ++
 .../builtins/isinf_mat-overloads.hlsl            |  2 ++
 clang/test/CodeGenHLSL/builtins/isinf_mat.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/isnan-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/isnan.hlsl       |  2 ++
 .../builtins/isnan_mat-overloads.hlsl            |  2 ++
 clang/test/CodeGenHLSL/builtins/isnan_mat.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/ldexp.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/length.hlsl      |  2 ++
 .../CodeGenHLSL/builtins/lerp-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/lerp.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/lit.hlsl         |  2 ++
 .../test/CodeGenHLSL/builtins/log-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/log.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/log10-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/log10.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/log10_mat.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/log2-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/log2.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/log2_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/log_mat.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/mad.hlsl         |  2 ++
 .../test/CodeGenHLSL/builtins/max-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/max.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/max_mat.hlsl     |  2 ++
 .../test/CodeGenHLSL/builtins/min-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/min.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/min_mat.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/mul.hlsl         |  2 ++
 .../builtins/normalize-overloads.hlsl            |  2 ++
 clang/test/CodeGenHLSL/builtins/normalize.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/or.hlsl          |  2 ++
 clang/test/CodeGenHLSL/builtins/or_mat.hlsl      |  2 ++
 .../test/CodeGenHLSL/builtins/pow-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/pow.hlsl         |  2 ++
 .../CodeGenHLSL/builtins/pow_mat-overloads.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/pow_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/radians-overloads.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/radians.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/radians_mat.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/rcp.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/rcp_mat.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/reflect.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/refract.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/round-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/round.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/round_mat.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/rsqrt-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/rsqrt.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/rsqrt_mat.hlsl   |  2 ++
 clang/test/CodeGenHLSL/builtins/saturate.hlsl    |  2 ++
 .../test/CodeGenHLSL/builtins/saturate_mat.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/select.hlsl      |  2 ++
 clang/test/CodeGenHLSL/builtins/select_mat.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/sign.hlsl        |  2 ++
 .../test/CodeGenHLSL/builtins/sin-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/sin.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/sin_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/sinh-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/sinh.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/sinh_mat.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/smoothstep.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/splitdouble.hlsl |  2 ++
 .../CodeGenHLSL/builtins/splitdouble_mat.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/sqrt-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/sqrt.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/sqrt_mat.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/step-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/step.hlsl        |  2 ++
 .../CodeGenHLSL/builtins/step_mat-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/step_mat.hlsl    |  2 ++
 .../test/CodeGenHLSL/builtins/tan-overloads.hlsl |  2 ++
 clang/test/CodeGenHLSL/builtins/tan.hlsl         |  2 ++
 clang/test/CodeGenHLSL/builtins/tan_mat.hlsl     |  2 ++
 .../CodeGenHLSL/builtins/tanh-overloads.hlsl     |  2 ++
 clang/test/CodeGenHLSL/builtins/tanh.hlsl        |  2 ++
 clang/test/CodeGenHLSL/builtins/tanh_mat.hlsl    |  2 ++
 .../CodeGenHLSL/builtins/transpose-builtin.hlsl  |  2 ++
 clang/test/CodeGenHLSL/builtins/transpose.hlsl   |  2 ++
 .../CodeGenHLSL/builtins/trunc-overloads.hlsl    |  2 ++
 clang/test/CodeGenHLSL/builtins/trunc.hlsl       |  2 ++
 clang/test/CodeGenHLSL/builtins/trunc_mat.hlsl   |  2 ++
 .../builtins/wave_get_lane_index_simple.hlsl     |  2 ++
 .../cbuffer-matrix-layout-keyword.hlsl           |  2 ++
 .../CodeGenHLSL/convergence/global_array.hlsl    |  2 ++
 .../CodeGenHLSL/debug/rwbuffer_debug_info.hlsl   |  2 ++
 .../CodeGenHLSL/groupsharedArgs/ArrTest.hlsl     |  2 ++
 .../CodeGenHLSL/groupsharedArgs/MatrixTest.hlsl  |  2 ++
 .../CodeGenHLSL/groupsharedArgs/Overloads.hlsl   |  2 ++
 .../CodeGenHLSL/groupsharedArgs/Scalartest.hlsl  |  2 ++
 .../groupsharedArgs/TemplateTest.hlsl            |  2 ++
 .../CodeGenHLSL/groupsharedArgs/VectorTest.hlsl  |  2 ++
 .../CodeGenHLSL/implicit-norecurse-attrib.hlsl   |  2 ++
 clang/test/CodeGenHLSL/inline-functions.hlsl     |  2 ++
 .../matrix-layout-attr-overrides-default.hlsl    |  2 ++
 .../matrix-layout-register-representation.hlsl   |  2 ++
 ...ix-member-one-based-accessor-scalar-load.hlsl |  2 ++
 ...x-member-one-based-accessor-scalar-store.hlsl |  2 ++
 .../matrix-member-one-based-swizzle-load.hlsl    |  2 ++
 .../matrix-member-one-based-swizzle-store.hlsl   |  2 ++
 ...x-member-zero-based-accessor-scalar-load.hlsl |  2 ++
 ...-member-zero-based-accessor-scalar-store.hlsl |  2 ++
 .../matrix-member-zero-based-swizzle-load.hlsl   |  2 ++
 .../matrix-member-zero-based-swizzle-store.hlsl  |  2 ++
 clang/test/CodeGenHLSL/no_int_promotion.hlsl     |  2 ++
 clang/test/CodeGenHLSL/packed-types.hlsl         |  2 ++
 .../resources-declared-only-once.hlsl            |  2 ++
 .../ByteAddressBuffers-constructors.hlsl         |  2 ++
 .../ByteAddressBuffers-matrix-legacy-order.hlsl  |  2 ++
 .../resources/ByteAddressBuffers-methods.hlsl    |  2 ++
 .../CBufferMatrixSingleSubscriptSwizzle.hlsl     |  2 ++
 .../ConstantBufferT-struct-passing.hlsl          |  2 ++
 .../CodeGenHLSL/resources/ConstantBufferT.hlsl   |  2 ++
 .../resources/Local-Resources/array.hlsl         |  2 ++
 .../consolidated_assignments.hlsl                |  2 ++
 .../init_from_global_array_dynamic_index.hlsl    |  2 ++
 .../resources/Local-Resources/static_local.hlsl  |  2 ++
 .../ternary_lvalue_unambiguous.hlsl              |  2 ++
 .../resources/MatrixElement_cbuffer.hlsl         |  2 ++
 .../resources/MultiSampledTextures-Load.hlsl     |  2 ++
 ...SampledTextures-default-explicit-binding.hlsl |  2 ++
 .../resources/MultiSampledTextures-default.hlsl  |  2 ++
 .../resources/NonUniformResourceIndex.hlsl       |  2 ++
 .../resources/RWBuffer-constructor-opt.hlsl      |  2 ++
 .../resources/RWBuffer-imageformat.hlsl          |  2 ++
 ...rizerOrderedStructuredBuffer-elementtype.hlsl |  2 ++
 .../StructuredBuffers-constructors.hlsl          |  2 ++
 .../resources/StructuredBuffers-elementtype.hlsl |  2 ++
 .../resources/StructuredBuffers-methods-lib.hlsl |  2 ++
 .../resources/StructuredBuffers-methods-ps.hlsl  |  2 ++
 .../resources/StructuredBuffers-subscripts.hlsl  |  2 ++
 .../Textures-CalculateLevelOfDetail.hlsl         |  2 ++
 .../CodeGenHLSL/resources/Textures-Gather.hlsl   |  2 ++
 .../resources/Textures-GetDimensions.hlsl        |  2 ++
 .../CodeGenHLSL/resources/Textures-Load.hlsl     |  2 ++
 .../CodeGenHLSL/resources/Textures-Mips.hlsl     |  2 ++
 .../CodeGenHLSL/resources/Textures-Sample.hlsl   |  2 ++
 .../resources/Textures-SampleBias.hlsl           |  2 ++
 .../resources/Textures-SampleCmp.hlsl            |  2 ++
 .../resources/Textures-SampleCmpLevelZero.hlsl   |  2 ++
 .../resources/Textures-SampleGrad.hlsl           |  2 ++
 .../resources/Textures-SampleLevel.hlsl          |  2 ++
 .../resources/Textures-Subscript.hlsl            |  2 ++
 .../Textures-default-explicit-binding.hlsl       |  2 ++
 .../CodeGenHLSL/resources/Textures-default.hlsl  |  2 ++
 .../resources/Textures-shorthand-contexts.hlsl   |  2 ++
 .../resources/TypedBuffers-constructor.hlsl      |  2 ++
 .../resources/TypedBuffers-elementtype.hlsl      |  2 ++
 .../resources/TypedBuffers-methods.hlsl          |  2 ++
 .../resources/TypedBuffers-subscript.hlsl        |  2 ++
 .../resources/cbuffer-empty-struct-array.hlsl    |  2 ++
 clang/test/CodeGenHLSL/resources/cbuffer.hlsl    |  2 ++
 .../test/CodeGenHLSL/resources/cbuffer_geps.hlsl |  2 ++
 .../resources/cbuffer_matrix_align.hlsl          |  2 ++
 .../resources/cbuffer_struct_passing.hlsl        |  2 ++
 .../cbuffer_struct_passing.logical.hlsl          |  2 ++
 .../cbuffer_struct_passing_with_resources.hlsl   |  2 ++
 .../resources/cbuffer_with_packoffset.hlsl       |  2 ++
 .../CodeGenHLSL/resources/default_cbuffer.hlsl   |  2 ++
 .../resources/default_cbuffer_with_layout.hlsl   |  2 ++
 .../CodeGenHLSL/resources/dynamic-resources.hlsl |  2 ++
 .../resources/res-array-global-dyn-index.hlsl    |  2 ++
 .../resources/res-array-global-multi-dim.hlsl    |  2 ++
 .../res-array-global-subarray-many.hlsl          |  2 ++
 .../resources/res-array-global-subarray-one.hlsl |  2 ++
 .../resources/res-array-global-to-local.hlsl     |  2 ++
 .../resources/res-array-global-unbounded.hlsl    |  2 ++
 .../CodeGenHLSL/resources/res-array-global.hlsl  |  2 ++
 .../resources/res-array-local-multi-dim.hlsl     |  2 ++
 .../CodeGenHLSL/resources/res-array-local1.hlsl  |  2 ++
 .../CodeGenHLSL/resources/res-array-local2.hlsl  |  2 ++
 .../CodeGenHLSL/resources/res-array-local3.hlsl  |  2 ++
 .../resources/res-array-rw-counter.hlsl          |  2 ++
 .../CodeGenHLSL/resources/resource-bindings.hlsl |  2 ++
 .../resources-in-structs-array-to-local.hlsl     |  2 ++
 .../resources/resources-in-structs-array.hlsl    |  2 ++
 .../resources-in-structs-inheritance.hlsl        |  2 ++
 .../resources-in-structs-method-call.hlsl        |  2 ++
 .../resources-in-structs-no-global.hlsl          |  2 ++
 .../resources-in-structs-static-global.hlsl      |  2 ++
 .../resources/resources-in-structs.hlsl          |  2 ++
 .../semantics/DispatchThreadID-noindex.hlsl      |  2 ++
 .../CodeGenHLSL/semantics/DispatchThreadID.hlsl  |  2 ++
 .../semantics/SV_Barycentrics-half.ps.hlsl       |  2 ++
 .../semantics/SV_Barycentrics.ps.hlsl            |  2 ++
 .../semantics/SV_GroupID-noindex.hlsl            |  2 ++
 clang/test/CodeGenHLSL/semantics/SV_GroupID.hlsl |  2 ++
 .../semantics/SV_GroupThreadID-noindex.hlsl      |  2 ++
 .../CodeGenHLSL/semantics/SV_GroupThreadID.hlsl  |  2 ++
 .../CodeGenHLSL/semantics/SV_InstanceID.vs.hlsl  |  2 ++
 .../CodeGenHLSL/semantics/SV_Position.ps.hlsl    |  2 ++
 .../CodeGenHLSL/semantics/SV_Position.vs.hlsl    |  2 ++
 .../CodeGenHLSL/semantics/SV_PrimitiveID.ps.hlsl |  2 ++
 .../CodeGenHLSL/semantics/SV_SampleIndex.ps.hlsl |  2 ++
 .../CodeGenHLSL/semantics/SV_ShadingRate.ps.hlsl |  2 ++
 .../CodeGenHLSL/semantics/SV_ShadingRate.vs.hlsl |  2 ++
 .../semantics/SV_StartInstanceLocation.vs.hlsl   |  2 ++
 .../semantics/SV_StartVertexLocation.vs.hlsl     |  2 ++
 .../test/CodeGenHLSL/semantics/SV_Target.ps.hlsl |  2 ++
 .../CodeGenHLSL/semantics/SV_VertexID.vs.hlsl    |  2 ++
 clang/test/CodeGenHLSL/semantics/SV_ViewID.hlsl  |  2 ++
 .../CodeGenHLSL/semantics/compute-id-16bit.hlsl  |  2 ++
 .../semantics/flat-decoration.ps.hlsl            |  2 ++
 .../semantics/interpolation-aggregate.hlsl       |  2 ++
 .../semantics/interpolation-spirv.hlsl           |  2 ++
 .../semantics/interpolation-vs-ps-link.hlsl      |  2 ++
 .../CodeGenHLSL/semantics/interpolation.hlsl     |  2 ++
 .../CodeGenHLSL/semantics/semantic-struct-1.hlsl |  2 ++
 .../CodeGenHLSL/semantics/semantic-struct-2.hlsl |  2 ++
 .../semantic-struct-nested-inherit.hlsl          |  2 ++
 .../semantics/semantic-struct-nested-shadow.hlsl |  2 ++
 .../semantics/semantic-struct-nested.hlsl        |  2 ++
 .../semantics/semantic.arbitrary.hlsl            |  2 ++
 .../CodeGenHLSL/semantics/semantic.array.hlsl    |  2 ++
 .../semantics/semantic.array.output.hlsl         |  2 ++
 ...semantic.explicit-location-output-struct.hlsl |  2 ++
 .../semantics/semantic.explicit-location.hlsl    |  2 ++
 .../semantics/semantic.explicit-mix-builtin.hlsl |  2 ++
 .../semantic.explicit-mix-builtin.vs.hlsl        |  2 ++
 .../semantics/semantic.explicit-mix.lib.hlsl     |  2 ++
 .../CodeGenHLSL/semantics/semantic.input.hlsl    |  2 ++
 .../CodeGenHLSL/semantics/semantic.matrix.hlsl   |  2 ++
 .../semantics/semantic.nested.vs.hlsl            |  2 ++
 .../CodeGenHLSL/semantics/semantic.output.hlsl   |  2 ++
 .../CodeGenHLSL/semantics/semantic.struct.hlsl   |  2 ++
 .../signature-packing-errors-output.hlsl         |  2 ++
 .../semantics/signature-packing-errors.hlsl      |  2 ++
 .../semantics/signature-packing-warnings.hlsl    |  4 ++++
 .../CodeGenHLSL/semantics/signature-packing.hlsl |  2 ++
 clang/test/CodeGenHLSL/sgep/array_load.hlsl      |  2 ++
 clang/test/CodeGenHLSL/sgep/array_store.hlsl     |  2 ++
 clang/test/CodeGenHLSL/sgep/load_global.hlsl     |  2 ++
 clang/test/CodeGenHLSL/sgep/object_method.hlsl   |  2 ++
 clang/test/CodeGenHLSL/shift-mask.hlsl           |  2 ++
 clang/test/CodeGenHLSL/static-local-ctor.hlsl    |  2 ++
 .../vk-features/SpirvType.alignment.hlsl         |  2 ++
 .../test/CodeGenHLSL/vk-features/SpirvType.hlsl  |  2 ++
 .../vk.pushconstant.access.bitfield.hlsl         |  2 ++
 .../vk-features/vk.pushconstant.access.hlsl      |  2 ++
 .../vk-features/vk.pushconstant.anon-struct.hlsl |  2 ++
 .../vk-features/vk.pushconstant.dxil.hlsl        |  2 ++
 .../vk-features/vk.pushconstant.layout.hlsl      |  2 ++
 .../vk-features/vk.pushconstant.static.hlsl      |  2 ++
 .../vk-features/vk.spec-constant.hlsl            |  2 ++
 clang/test/CodeGenHLSL/vk-input-builtin.hlsl     |  2 ++
 clang/test/CodeGenHLSL/vk-output-builtin.hlsl    |  2 ++
 clang/test/CodeGenHLSL/vk_binding_attr.hlsl      |  2 ++
 clang/test/Driver/dxc_rootsig-define.hlsl        |  2 ++
 .../hlsl_annotations_on_struct_members.hlsl      |  4 +++-
 .../ParserHLSL/hlsl_contained_type_attr.hlsl     |  2 ++
 .../ParserHLSL/hlsl_resource_handle_attrs.hlsl   |  2 ++
 .../hlsl_contained_type_attr_error.hlsl          |  2 ++
 .../test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/Barrier-availability.hlsl  |  2 ++
 .../BuiltIns/Barrier-context-errors.hlsl         |  2 ++
 .../test/SemaHLSL/BuiltIns/Barrier-context.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/Barrier-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/Barrier-spirv.hlsl  |  2 ++
 .../Barrier-strict-availability-errors.hlsl      |  2 ++
 .../SemaHLSL/BuiltIns/Buffers-Load-const.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/Buffers.hlsl        |  2 ++
 .../ByteAddressBuffer-InterlockedAdd-errors.hlsl |  2 ++
 ...AddressBuffer-InterlockedAdd-sm65-errors.hlsl |  2 ++
 ...AddressBuffer-InterlockedAnd-sm65-errors.hlsl |  2 ++
 ...r-InterlockedCompareExchange-sm65-errors.hlsl |  2 ++
 ...erlockedCompareExchangeFloatBitwise-sm60.hlsl |  2 ++
 ...ffer-InterlockedCompareStore-sm65-errors.hlsl |  2 ++
 ...InterlockedCompareStoreFloatBitwise-sm60.hlsl |  2 ++
 ...AddressBuffer-InterlockedExchange-errors.hlsl |  2 ++
 ...ssBuffer-InterlockedExchange-sm65-errors.hlsl |  2 ++
 ...ressBuffer-InterlockedExchangeFloat-sm60.hlsl |  2 ++
 .../ByteAddressBuffer-InterlockedMax-errors.hlsl |  2 ++
 ...AddressBuffer-InterlockedMax-sm65-errors.hlsl |  2 ++
 .../ByteAddressBuffer-InterlockedMin-errors.hlsl |  2 ++
 ...AddressBuffer-InterlockedMin-sm65-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/ByteAddressBuffers.hlsl    |  2 ++
 .../BuiltIns/ConstantBuffer-member-funcs.hlsl    |  2 ++
 .../BuiltIns/D3DCOLORtoUBYTE4-errors.hlsl        |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedAdd-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedAnd-errors.hlsl |  2 ++
 .../InterlockedCompareExchange-errors.hlsl       |  2 ++
 ...lockedCompareExchangeFloatBitwise-errors.hlsl |  2 ++
 .../BuiltIns/InterlockedCompareStore-errors.hlsl |  2 ++
 ...terlockedCompareStoreFloatBitwise-errors.hlsl |  2 ++
 .../BuiltIns/InterlockedExchange-errors.hlsl     |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedMax-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedMin-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedOr-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/InterlockedXor-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/QuadAll-availability.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/QuadAll-errors.hlsl |  2 ++
 .../BuiltIns/QuadReadAcrossDiagonal-errors.hlsl  |  2 ++
 .../BuiltIns/QuadReadAcrossX-errors.hlsl         |  2 ++
 .../BuiltIns/QuadReadAcrossY-errors.hlsl         |  2 ++
 clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl      |  2 ++
 .../SemaHLSL/BuiltIns/RWStructuredBuffers.hlsl   |  2 ++
 .../SemaHLSL/BuiltIns/StructuredBuffers.hlsl     |  2 ++
 .../BuiltIns/WaveActiveAllEqual-errors.hlsl      |  2 ++
 .../BuiltIns/WaveActiveBallot-errors.hlsl        |  2 ++
 .../BuiltIns/WaveActiveBitOr-errors.hlsl         |  2 ++
 .../SemaHLSL/BuiltIns/WaveActiveMax-errors.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/WaveActiveMin.hlsl  |  2 ++
 .../BuiltIns/WaveActiveProduct-errors.hlsl       |  2 ++
 .../SemaHLSL/BuiltIns/WaveActiveSum-errors.hlsl  |  2 ++
 .../BuiltIns/WaveMultiPrefixBitAnd-errors.hlsl   |  2 ++
 .../BuiltIns/WaveMultiPrefixBitOr-errors.hlsl    |  2 ++
 .../BuiltIns/WaveMultiPrefixBitXor-errors.hlsl   |  2 ++
 .../WaveMultiPrefixCountBits-errors.hlsl         |  2 ++
 .../BuiltIns/WaveMultiPrefixProduct-errors.hlsl  |  2 ++
 .../BuiltIns/WaveMultiPrefixSum-errors.hlsl      |  2 ++
 .../BuiltIns/WavePrefixCountBits-errors.hlsl     |  2 ++
 .../BuiltIns/WavePrefixProduct-errors.hlsl       |  2 ++
 .../SemaHLSL/BuiltIns/WavePrefixSum-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/WaveReadLaneAt-errors.hlsl |  2 ++
 .../BuiltIns/WaveReadLaneFirst-errors.hlsl       |  2 ++
 clang/test/SemaHLSL/BuiltIns/abs_mat-errors.hlsl |  2 ++
 .../test/SemaHLSL/BuiltIns/asdouble-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/asfloat-constexpr.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/asfloat-errors.hlsl |  2 ++
 .../SemaHLSL/BuiltIns/asfloat_mat-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/asint-errors.hlsl   |  2 ++
 clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl |  2 ++
 .../test/SemaHLSL/BuiltIns/asint_mat-errors.hlsl |  2 ++
 .../test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/asuint-errors.hlsl  |  2 ++
 .../test/SemaHLSL/BuiltIns/asuint16-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/asuint_mat-errors.hlsl     |  2 ++
 .../test/SemaHLSL/BuiltIns/atan2_mat-errors.hlsl |  2 ++
 .../binary-compat-overload-warnings.hlsl         |  2 ++
 clang/test/SemaHLSL/BuiltIns/clamp-errors.hlsl   |  2 ++
 clang/test/SemaHLSL/BuiltIns/clip-errors.hlsl    |  2 ++
 .../test/SemaHLSL/BuiltIns/countbits-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/cross-errors.hlsl   |  2 ++
 .../test/SemaHLSL/BuiltIns/distance-errors.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/dot-errors.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/dot2add-errors.hlsl |  2 ++
 .../BuiltIns/dot4add_u8packed-errors.hlsl        |  2 ++
 clang/test/SemaHLSL/BuiltIns/exp-errors.hlsl     |  2 ++
 .../test/SemaHLSL/BuiltIns/f16tof32-errors.hlsl  |  2 ++
 .../test/SemaHLSL/BuiltIns/f32tof16-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/faceforward-errors.hlsl    |  2 ++
 .../SemaHLSL/BuiltIns/firstbithigh-errors.hlsl   |  2 ++
 .../SemaHLSL/BuiltIns/firstbitlow-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/fma-errors.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/fmod-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/frac-errors.hlsl    |  2 ++
 .../SemaHLSL/BuiltIns/geometric-long-vector.hlsl |  2 ++
 .../BuiltIns/half-float-only-errors.hlsl         |  2 ++
 .../BuiltIns/half-float-only-errors2.hlsl        |  2 ++
 .../test/SemaHLSL/BuiltIns/isfinite-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/isfinite_mat-errors.hlsl   |  2 ++
 clang/test/SemaHLSL/BuiltIns/isinf-errors.hlsl   |  2 ++
 .../test/SemaHLSL/BuiltIns/isinf_mat-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/isnan-errors.hlsl   |  2 ++
 .../test/SemaHLSL/BuiltIns/isnan_mat-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/ldexp-errors.hlsl   |  2 ++
 clang/test/SemaHLSL/BuiltIns/length-errors.hlsl  |  2 ++
 .../BuiltIns/logical-mat-operator-errors.hlsl    |  2 ++
 .../BuiltIns/logical-operator-errors.hlsl        |  2 ++
 clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl     |  2 ++
 .../BuiltIns/matrix-basic_types-errors.hlsl      |  2 ++
 clang/test/SemaHLSL/BuiltIns/matrix-errors.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/max_mat-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/min_mat-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/mul-errors.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/pow_mat-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/rcp-errors.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/reflect-errors.hlsl |  2 ++
 clang/test/SemaHLSL/BuiltIns/refract-errors.hlsl |  2 ++
 .../BuiltIns/resource_gather-errors.hlsl         |  2 ++
 .../BuiltIns/resource_getpointer-errors.hlsl     |  2 ++
 .../SemaHLSL/BuiltIns/resource_load-errors.hlsl  |  2 ++
 .../BuiltIns/resource_sample-errors.hlsl         |  2 ++
 .../SemaHLSL/BuiltIns/reversebits-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/round-errors.hlsl   |  2 ++
 clang/test/SemaHLSL/BuiltIns/rsqrt-errors.hlsl   |  2 ++
 .../test/SemaHLSL/BuiltIns/saturate-errors.hlsl  |  2 ++
 clang/test/SemaHLSL/BuiltIns/select-errors.hlsl  |  2 ++
 .../SemaHLSL/BuiltIns/select_mat-errors.hlsl     |  2 ++
 .../SemaHLSL/BuiltIns/smoothstep-errors.hlsl     |  2 ++
 .../SemaHLSL/BuiltIns/splitdouble-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/BuiltIns/step-errors.hlsl    |  2 ++
 .../ternary-compat-overload-warnings.hlsl        |  2 ++
 .../test/SemaHLSL/BuiltIns/transpose-errors.hlsl |  2 ++
 .../BuiltIns/unary-compat-overload-warnings.hlsl |  2 ++
 .../vec-scalar-compat-overload-warnings.hlsl     |  2 ++
 clang/test/SemaHLSL/BuiltIns/vector-errors.hlsl  |  2 ++
 .../Language/AggregateSplatCast-errors.hlsl      |  2 ++
 .../SemaHLSL/Language/AggregateSplatCasts.hlsl   |  2 ++
 clang/test/SemaHLSL/Language/AssignArray.hlsl    |  2 ++
 .../SemaHLSL/Language/ConstexprVectorCasts.hlsl  |  2 ++
 .../Language/ElementwiseCast-errors.hlsl         |  2 ++
 .../test/SemaHLSL/Language/ElementwiseCasts.hlsl |  2 ++
 .../SemaHLSL/Language/InitIncompleteArrays.hlsl  |  2 ++
 clang/test/SemaHLSL/Language/InitListAST.hlsl    |  2 ++
 clang/test/SemaHLSL/Language/InitLists.hlsl      |  2 ++
 .../test/SemaHLSL/Language/MatrixSplatCasts.hlsl |  2 ++
 .../test/SemaHLSL/Language/OutputParameters.hlsl |  2 ++
 .../Language/UsualArithmeticConversions.hlsl     |  2 ++
 clang/test/SemaHLSL/Language/Volatile.hlsl       |  2 ++
 .../Language/groupsharedArgs/ExplicitCast.hlsl   |  2 ++
 .../groupsharedArgs/ExportNoInlineTest.hlsl      |  2 ++
 .../SemaHLSL/Language/groupsharedArgs/InOut.hlsl |  2 ++
 .../groupsharedArgs/NotGroupSharedTest.hlsl      |  2 ++
 .../Language/groupsharedArgs/ScalarTest.hlsl     |  2 ++
 .../MatrixElementOverloadResolution.hlsl         |  2 ++
 .../SemaHLSL/Operators/frem_modulo-errors.hlsl   |  2 ++
 .../Operators/half-vector-comparisons.hlsl       |  2 ++
 clang/test/SemaHLSL/Operators/logical-not.hlsl   |  2 ++
 .../SemaHLSL/Operators/matrix-comparisons.hlsl   |  2 ++
 .../test/SemaHLSL/Resources/ConstantBuffers.hlsl |  2 ++
 .../array_partial_init_dynamic.hlsl              |  2 ++
 .../Local-Resources/assign_wrong_type.hlsl       |  2 ++
 .../Resources/Local-Resources/bindings.hlsl      |  2 ++
 .../Resources/Local-Resources/bindings_errs.hlsl |  2 ++
 .../branched_reassign_ambiguous.hlsl             |  2 ++
 .../Local-Resources/const_local_store.hlsl       |  2 ++
 .../Local-Resources/explicit_register.hlsl       |  2 ++
 .../Resources/Local-Resources/static_const.hlsl  |  2 ++
 .../Resources/MultiSampledTextures-Sema.hlsl     |  2 ++
 .../SampleCount-template-arg-errors.hlsl         |  2 ++
 .../Textures-CalculateLevelOfDetail.hlsl         |  2 ++
 .../test/SemaHLSL/Resources/Textures-Gather.hlsl |  2 ++
 .../Resources/Textures-GatherCmp-Vulkan.hlsl     |  2 ++
 .../Resources/Textures-GetDimensions.hlsl        |  2 ++
 .../SemaHLSL/Resources/Textures-Load-errors.hlsl |  2 ++
 .../SemaHLSL/Resources/Textures-SampleBias.hlsl  |  2 ++
 .../SemaHLSL/Resources/Textures-SampleCmp.hlsl   |  2 ++
 .../Resources/Textures-SampleCmpLevelZero.hlsl   |  2 ++
 .../SemaHLSL/Resources/Textures-SampleGrad.hlsl  |  2 ++
 .../SemaHLSL/Resources/Textures-SampleLevel.hlsl |  2 ++
 clang/test/SemaHLSL/Resources/Textures-Sema.hlsl |  2 ++
 .../SemaHLSL/Resources/Textures-Subscript.hlsl   |  2 ++
 .../Resources/Textures-declaration-order.hlsl    |  2 ++
 .../Textures-derivative-availability.hlsl        |  2 ++
 .../Textures-double-element-type-errors.hlsl     |  2 ++
 .../Resources/Textures-integer-element-type.hlsl |  2 ++
 .../SemaHLSL/Resources/Textures-mips-errors.hlsl |  2 ++
 .../Textures-unsupported-methods-errors.hlsl     |  2 ++
 .../dynamic-resources-availability.hlsl          |  2 ++
 .../SemaHLSL/Resources/dynamic-resources.hlsl    |  2 ++
 .../SemaHLSL/Resources/packoffset-invalid.hlsl   |  2 ++
 .../Resources/prohibit_resource_edits.hlsl       |  2 ++
 .../resource_binding_attr_error_basic.hlsl       |  2 ++
 ...esource_binding_attr_error_silence_diags.hlsl |  2 ++
 .../resource_binding_attr_error_space.hlsl       |  2 ++
 .../resource_binding_attr_error_uint32_max.hlsl  |  2 ++
 .../Resources/resource_binding_implicit.hlsl     |  2 ++
 .../Resources/resource_params_noinline.hlsl      |  2 ++
 .../resources-in-struct-array-error.hlsl         |  2 ++
 .../SemaHLSL/Resources/static_resources.hlsl     |  2 ++
 .../Resources/unbounded_resource_arrays.hlsl     |  2 ++
 .../SemaHLSL/Semantics/arbitrary.ms.input.hlsl   |  2 ++
 .../SemaHLSL/Semantics/arbitrary.ps.output.hlsl  |  2 ++
 .../SemaHLSL/Semantics/barycentrics.model.hlsl   |  2 ++
 .../test/SemaHLSL/Semantics/barycentrics.ps.hlsl |  2 ++
 .../SemaHLSL/Semantics/barycentrics.stages.hlsl  |  2 ++
 .../test/SemaHLSL/Semantics/entry_parameter.hlsl |  2 ++
 .../SemaHLSL/Semantics/instanceid.output.hlsl    |  2 ++
 clang/test/SemaHLSL/Semantics/instanceid.ps.hlsl |  2 ++
 clang/test/SemaHLSL/Semantics/instanceid.vs.hlsl |  2 ++
 .../Semantics/invalid_entry_parameter.hlsl       |  2 ++
 .../SemaHLSL/Semantics/output-parameters.hlsl    |  2 ++
 clang/test/SemaHLSL/Semantics/position.ps.hlsl   |  2 ++
 .../SemaHLSL/Semantics/position.ps.size.hlsl     |  2 ++
 .../SemaHLSL/Semantics/position.ps.struct.hlsl   |  6 ++++--
 .../Semantics/position.ps.struct.reuse.hlsl      |  2 ++
 .../Semantics/primitiveid.ps.errors.hlsl         |  2 ++
 .../test/SemaHLSL/Semantics/primitiveid.ps.hlsl  |  2 ++
 .../SemaHLSL/Semantics/primitiveid.stages.hlsl   |  2 ++
 .../test/SemaHLSL/Semantics/sampleindex.ps.hlsl  |  2 ++
 .../SemaHLSL/Semantics/sampleindex.stages.hlsl   |  2 ++
 .../SemaHLSL/Semantics/semantic-64bit-types.hlsl |  2 ++
 .../SemaHLSL/Semantics/semantic-indexing.hlsl    |  2 ++
 .../SemaHLSL/Semantics/semantic-overlap.hlsl     |  2 ++
 .../SemaHLSL/Semantics/semantic-stage.vs-ps.hlsl |  2 ++
 .../test/SemaHLSL/Semantics/semantic-types.hlsl  |  2 ++
 .../Semantics/semantic-zero-sized-array.hlsl     |  2 ++
 .../semantic.explicit-mix-builtin-vs.hlsl        |  2 ++
 .../semantic.explicit-mix-location-2.hlsl        |  2 ++
 .../semantic.explicit-mix-location.hlsl          |  2 ++
 .../Semantics/shadingrate.explicit-location.hlsl |  2 ++
 .../SemaHLSL/Semantics/shadingrate.model.hlsl    |  2 ++
 .../Semantics/shadingrate.ms-as.input.hlsl       |  2 ++
 .../test/SemaHLSL/Semantics/shadingrate.ps.hlsl  |  2 ++
 .../SemaHLSL/Semantics/shadingrate.stages.hlsl   |  2 ++
 .../Semantics/startinstancelocation.model.hlsl   |  2 ++
 .../Semantics/startinstancelocation.stages.hlsl  |  2 ++
 .../Semantics/startinstancelocation.vs.hlsl      |  2 ++
 .../Semantics/startvertexlocation.model.hlsl     |  2 ++
 .../Semantics/startvertexlocation.stages.hlsl    |  2 ++
 .../Semantics/startvertexlocation.vs.hlsl        |  2 ++
 clang/test/SemaHLSL/Semantics/struct_input.hlsl  |  2 ++
 clang/test/SemaHLSL/Semantics/target.index.hlsl  |  2 ++
 .../test/SemaHLSL/Semantics/target.ps.input.hlsl |  2 ++
 .../test/SemaHLSL/Semantics/target.vs.input.hlsl |  2 ++
 .../SemaHLSL/Semantics/target.vs.output.hlsl     |  2 ++
 .../Semantics/valid_entry_parameter.hlsl         |  2 ++
 clang/test/SemaHLSL/Semantics/vertexid.ps.hlsl   |  2 ++
 clang/test/SemaHLSL/Semantics/vertexid.vs.hlsl   |  2 ++
 clang/test/SemaHLSL/Semantics/viewid.model.hlsl  |  2 ++
 .../SemaHLSL/Semantics/viewid.ps.errors.hlsl     |  2 ++
 clang/test/SemaHLSL/Semantics/viewid.ps.hlsl     |  2 ++
 clang/test/SemaHLSL/Semantics/viewid.stages.hlsl |  2 ++
 clang/test/SemaHLSL/SplatOverloadResolution.hlsl |  2 ++
 .../SemaHLSL/TruncationOverloadResolution.hlsl   |  2 ++
 .../Types/AggregateSplatConstantExpr.hlsl        |  2 ++
 .../Types/Arithmetic/literal_suffixes_202x.hlsl  |  2 ++
 .../Types/BuiltinMatrix/MatrixCastErrors.hlsl    |  2 ++
 .../Types/BuiltinMatrix/MatrixConstantExpr.hlsl  |  2 ++
 .../MatrixFloatPrecisionWarnings.hlsl            |  2 ++
 .../MatrixImplicitTruncCastWarnings.hlsl         |  2 ++
 .../Types/BuiltinMatrix/MatrixSplatErrors.hlsl   |  2 ++
 .../Types/BuiltinVector/ScalarSwizzleErrors.hlsl |  2 ++
 .../Types/BuiltinVector/ScalarSwizzles.hlsl      |  2 ++
 .../BuiltinVector/TruncationConstantExpr.hlsl    |  2 ++
 .../BuiltinVector/VectorCastConstantExpr.hlsl    |  2 ++
 .../Types/ElementwiseCastConstantExpr.hlsl       |  2 ++
 .../SemaHLSL/Types/Traits/IsIntangibleType.hlsl  |  2 ++
 .../Traits/IsTypedResourceElementCompatible.hlsl |  2 ++
 .../Types/Traits/ScalarizedLayoutCompatible.hlsl |  2 ++
 .../SemaHLSL/Types/invalid-longvec-swizzle.hlsl  |  2 ++
 .../test/SemaHLSL/Types/packed-types-error.hlsl  |  2 ++
 clang/test/SemaHLSL/Types/typedefs.hlsl          |  2 ++
 .../VectorElementOverloadResolution.hlsl         |  2 ++
 .../test/SemaHLSL/VectorOverloadResolution.hlsl  |  3 +++
 .../inline-spirv/SpirvType.incomplete.hlsl       |  2 ++
 .../inline-spirv/SpirvType.literal.error.hlsl    |  2 ++
 .../SemaHLSL/interpolation-modifiers-vertex.hlsl |  2 ++
 clang/test/SemaHLSL/interpolation-modifiers.hlsl |  2 ++
 .../SemaHLSL/matrix-member-access-errors.hlsl    |  2 ++
 clang/test/SemaHLSL/matrix_layout_attr.hlsl      |  2 ++
 .../SemaHLSL/matrix_single_subscript_errors.hlsl |  2 ++
 clang/test/SemaHLSL/no-conversion-warnings.hlsl  |  2 ++
 .../SemaHLSL/standard_conversion_sequences.hlsl  |  2 ++
 clang/test/SemaHLSL/vk-ext-input-builtin.hlsl    |  2 ++
 clang/test/SemaHLSL/vk-ext-output-builtin.hlsl   |  2 ++
 clang/test/SemaHLSL/vk.spec-constant.error.hlsl  |  2 ++
 754 files changed, 1534 insertions(+), 23 deletions(-)
 create mode 100644 clang/test/AST/HLSL/implicit-using-namespace.hlsl

diff --git a/clang/lib/Sema/HLSLExternalSemaSource.cpp b/clang/lib/Sema/HLSLExternalSemaSource.cpp
index 9d718cef42728..7d4be18a39251 100644
--- a/clang/lib/Sema/HLSLExternalSemaSource.cpp
+++ b/clang/lib/Sema/HLSLExternalSemaSource.cpp
@@ -71,12 +71,13 @@ void HLSLExternalSemaSource::InitializeSema(Sema &S) {
   defineHLSLTypesWithForwardDeclarations();
   defineHLSLAtomicIntrinsics();
 
+  if (SemaPtr->getLangOpts().getHLSLVersion() >= LangOptions::HLSL_202x)
+    return;
+
   // This adds a `using namespace hlsl` directive. In DXC, we don't put HLSL's
   // built in types inside a namespace, but we are planning to change that in
-  // the near future. In order to be source compatible older versions of HLSL
-  // will need to implicitly use the hlsl namespace. For now in clang everything
-  // will get added to the namespace, and we can remove the using directive for
-  // future language versions to match HLSL's evolution.
+  // the near future. In order to be source compatible, HLSL before 202x
+  // will need to implicitly use the hlsl namespace.
   auto *UsingDecl = UsingDirectiveDecl::Create(
       AST, AST.getTranslationUnitDecl(), SourceLocation(), SourceLocation(),
       NestedNameSpecifierLoc(), SourceLocation(), HLSLNamespace,
diff --git a/clang/test/AST/ByteCode/hlsl.hlsl b/clang/test/AST/ByteCode/hlsl.hlsl
index 60a7f44c443a2..db86ccef55d58 100644
--- a/clang/test/AST/ByteCode/hlsl.hlsl
+++ b/clang/test/AST/ByteCode/hlsl.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl2021 -finclude-default-header -x hlsl -std=hlsl202x -triple \
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - -fexperimental-new-constant-interpreter | FileCheck %s
diff --git a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
index 374e8ce215445..9bb597000c676 100644
--- a/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/ByteAddressBuffers-AST.hlsl
@@ -30,6 +30,8 @@
 
 #ifndef EMPTY
 
+using namespace hlsl;
+
 RESOURCE Buffer;
 
 #endif
diff --git a/clang/test/AST/HLSL/ConstantBuffers-AST.hlsl b/clang/test/AST/HLSL/ConstantBuffers-AST.hlsl
index 82fc8dc5aeb28..0115cfa35fc8f 100644
--- a/clang/test/AST/HLSL/ConstantBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/ConstantBuffers-AST.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -disable-llvm-passes -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: ClassTemplateDecl {{.*}} ConstantBuffer
 // CHECK: TemplateTypeParmDecl {{.*}} element_type
 // CHECK: CXXRecordDecl {{.*}} ConstantBuffer definition
diff --git a/clang/test/AST/HLSL/DynamicResources-AST.hlsl b/clang/test/AST/HLSL/DynamicResources-AST.hlsl
index 44acc5fd1ea18..95ac104c77ca0 100644
--- a/clang/test/AST/HLSL/DynamicResources-AST.hlsl
+++ b/clang/test/AST/HLSL/DynamicResources-AST.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 // Global variables for ResourceDescriptorHeap and SamplerDescriptorHeap
 // CHECK: VarDecl {{.*}} used ResourceDescriptorHeap 'hlsl_private __detail::resource_descriptor_heap_struct' static internal-linkage
 // CHECK-NEXT: AvailabilityAttr {{.*}} shadermodel 6.6 0 0 "" "" 0
diff --git a/clang/test/AST/HLSL/Inputs/pch.hlsl b/clang/test/AST/HLSL/Inputs/pch.hlsl
index 90d7a19ae424c..6fad6b434b9e5 100644
--- a/clang/test/AST/HLSL/Inputs/pch.hlsl
+++ b/clang/test/AST/HLSL/Inputs/pch.hlsl
@@ -1,4 +1,4 @@
-
+using namespace hlsl;
 float2 foo(float2 a, float2 b) {
   return a + b;
 }
diff --git a/clang/test/AST/HLSL/Inputs/pch_spirv_type.hlsl b/clang/test/AST/HLSL/Inputs/pch_spirv_type.hlsl
index 326c75dbc3bbe..92cc93fcadaa1 100644
--- a/clang/test/AST/HLSL/Inputs/pch_spirv_type.hlsl
+++ b/clang/test/AST/HLSL/Inputs/pch_spirv_type.hlsl
@@ -1,4 +1,4 @@
-
+using namespace hlsl;
 float2 foo(float2 a, float2 b) {
   return a + b;
 }
diff --git a/clang/test/AST/HLSL/Inputs/pch_with_buf.hlsl b/clang/test/AST/HLSL/Inputs/pch_with_buf.hlsl
index bca281638a5bb..91a914c63e32a 100644
--- a/clang/test/AST/HLSL/Inputs/pch_with_buf.hlsl
+++ b/clang/test/AST/HLSL/Inputs/pch_with_buf.hlsl
@@ -1,4 +1,4 @@
-
+using namespace hlsl;
 float2 foo(float2 a, float2 b) {
   return a + b;
 }
diff --git a/clang/test/AST/HLSL/MultiSampledTextures-AST.hlsl b/clang/test/AST/HLSL/MultiSampledTextures-AST.hlsl
index d7bd39b3577af..222b4336aa768 100644
--- a/clang/test/AST/HLSL/MultiSampledTextures-AST.hlsl
+++ b/clang/test/AST/HLSL/MultiSampledTextures-AST.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -o - %s | FileCheck %s -DTEXTURE=Texture2DMS -DINDEX_SIZE=2
 
+using namespace hlsl;
+
 // The class template: an `element_type` type parameter followed by an `int`
 // `sample_count` non-type parameter that defaults to 0.
 // CHECK: ClassTemplateDecl {{.*}} [[TEXTURE]]
diff --git a/clang/test/AST/HLSL/OutArgExpr.hlsl b/clang/test/AST/HLSL/OutArgExpr.hlsl
index 64f5369ed7949..9a097790e357e 100644
--- a/clang/test/AST/HLSL/OutArgExpr.hlsl
+++ b/clang/test/AST/HLSL/OutArgExpr.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -finclude-default-header -include-pch %t.pch %s -ast-dump | FileCheck --check-prefix=AST %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -finclude-default-header -include-pch %t.pch %s -ast-print | FileCheck %s
 
+using namespace hlsl;
+
 
 #ifndef TEST_HLSL
 #define TEST_HLSL
diff --git a/clang/test/AST/HLSL/PackedStruct.hlsl b/clang/test/AST/HLSL/PackedStruct.hlsl
index 4bffd275c757b..e40953556a10d 100644
--- a/clang/test/AST/HLSL/PackedStruct.hlsl
+++ b/clang/test/AST/HLSL/PackedStruct.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -ast-dump %s | FileCheck %s
 // Structs are packed by default in HLSL
 
+using namespace hlsl;
+
 #include <hlsl/hlsl_basic_types.h>
 
 // CHECK: CXXRecordDecl {{.*}} struct S definition
diff --git a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
index 4cfced0fd9c7e..96c68f8f586b8 100644
--- a/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/StructuredBuffers-AST.hlsl
@@ -66,6 +66,8 @@
 
 #ifndef EMPTY
 
+using namespace hlsl;
+
 RESOURCE<float> Buffer;
 
 #endif
diff --git a/clang/test/AST/HLSL/Textures-AST.hlsl b/clang/test/AST/HLSL/Textures-AST.hlsl
index 839da416c714c..d5f50ce590ab8 100644
--- a/clang/test/AST/HLSL/Textures-AST.hlsl
+++ b/clang/test/AST/HLSL/Textures-AST.hlsl
@@ -6,6 +6,8 @@
 // RUN:   %s --check-prefixes=CHECK,SRV -DTEXTURE=Texture1D -DDIM_NAME=1D \
 // RUN:   -DINDEX_TYPE="unsigned int" -DLOCATION_TYPE=int
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump \
 // RUN:   -disable-llvm-passes -finclude-default-header -DINDEX_ARG_TYPE=uint3 \
diff --git a/clang/test/AST/HLSL/Textures-scalar-AST.hlsl b/clang/test/AST/HLSL/Textures-scalar-AST.hlsl
index 643b5f553741e..ce0bb1887ea43 100644
--- a/clang/test/AST/HLSL/Textures-scalar-AST.hlsl
+++ b/clang/test/AST/HLSL/Textures-scalar-AST.hlsl
@@ -11,6 +11,8 @@
 // RUN:   -DINDEX_TYPE="unsigned int" -DIS_ARRAY="" -DLOCATION_TYPE=float \
 // RUN:   -DGRADIENT_TYPE=float -DOFFSET_TYPE=int
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump \
 // RUN:   -disable-llvm-passes -finclude-default-header -DHAS_OFFSET \
diff --git a/clang/test/AST/HLSL/Textures-shorthand-AST.hlsl b/clang/test/AST/HLSL/Textures-shorthand-AST.hlsl
index a7d6f9d3d9897..5d150809c0d4f 100644
--- a/clang/test/AST/HLSL/Textures-shorthand-AST.hlsl
+++ b/clang/test/AST/HLSL/Textures-shorthand-AST.hlsl
@@ -4,6 +4,8 @@
 // RUN:   -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture1D -o \
 // RUN:   - %s | FileCheck %s -DTEXTURE=Texture1D
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump \
 // RUN:   -disable-llvm-passes -finclude-default-header \
diff --git a/clang/test/AST/HLSL/Textures-vector-AST.hlsl b/clang/test/AST/HLSL/Textures-vector-AST.hlsl
index b0f19a8923c9e..2bd296a38508a 100644
--- a/clang/test/AST/HLSL/Textures-vector-AST.hlsl
+++ b/clang/test/AST/HLSL/Textures-vector-AST.hlsl
@@ -11,6 +11,8 @@
 // RUN:   -DINDEX_TYPE="unsigned int" -DIS_ARRAY="" -DLOCATION_TYPE=float \
 // RUN:   -DGRADIENT_TYPE=float -DOFFSET_TYPE=int
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump \
 // RUN:   -disable-llvm-passes -finclude-default-header -DHAS_OFFSET \
diff --git a/clang/test/AST/HLSL/TypdefArrayParam.hlsl b/clang/test/AST/HLSL/TypdefArrayParam.hlsl
index 37f7a66de23a1..45531a89832fc 100644
--- a/clang/test/AST/HLSL/TypdefArrayParam.hlsl
+++ b/clang/test/AST/HLSL/TypdefArrayParam.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -x hlsl -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 typedef uint4 uint32_t4;
 typedef uint32_t4 uint32_t8[2];
 
diff --git a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
index 048ffe3845679..05b60331897b1 100644
--- a/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
+++ b/clang/test/AST/HLSL/TypedBuffers-AST.hlsl
@@ -12,6 +12,8 @@
 // RUN:   -DRESOURCE=Buffer %s | FileCheck -DRESOURCE=Buffer \
 // RUN:   -check-prefixes=CHECK,CHECK-SRV %s
 
+using namespace hlsl;
+
 // TODO: Add AST tests for RasterizerOrderedBuffer here
 
 // This test tests two different AST generations each typed buffer.
diff --git a/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl b/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
index 98428225ebb3d..53a5a2d2c603b 100644
--- a/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
+++ b/clang/test/AST/HLSL/ast-dump-APValue-matrix.hlsl
@@ -13,6 +13,8 @@
 // RUN: | sed -e "s/ <undeserialized declarations>//" -e "s/ imported//" \
 // RUN: | FileCheck --strict-whitespace %s
 
+using namespace hlsl;
+
 export void Test() {
   constexpr int2x2 mat2x2 = {1, 2, 3, 4};
   // CHECK: VarDecl {{.*}} mat2x2 {{.*}} constexpr cinit
diff --git a/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl b/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
index 918db23c4d9f8..c115117c136d2 100644
--- a/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
+++ b/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
@@ -1,23 +1,25 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute -x hlsl -ast-dump -o - %s | FileCheck %s
 
-// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:4:1, col:83> col:83 referenced AType 'vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+using namespace hlsl;
+
+// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:6:1, col:83> col:83 referenced AType 'vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 typedef vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>> AType;
-// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:6:1, col:133> col:133 referenced BType 'vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 4886718345L>, float, vk::Literal<vk::integral_constant<uint, 456>>>':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
+// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:8:1, col:133> col:133 referenced BType 'vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 4886718345L>, float, vk::Literal<vk::integral_constant<uint, 456>>>':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
 typedef vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 0x123456789>, float, vk::Literal<vk::integral_constant<uint, 456>>> BType;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:9:1, col:7> col:7 AValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK: VarDecl 0x{{.+}} <{{.+}}:11:1, col:7> col:7 AValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 AType AValue;
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:11:1, col:7> col:7 BValue 'BType':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
+// CHECK: VarDecl 0x{{.+}} <{{.+}}:13:1, col:7> col:7 BValue 'BType':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
 BType BValue;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:14:1, col:80> col:80 CValue 'vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 305419896>>>':'__hlsl_spirv_type<123, 0, 0, vk::Literal<vk::integral_constant<uint, 305419896>>>'
+// CHECK: VarDecl 0x{{.+}} <{{.+}}:16:1, col:80> col:80 CValue 'vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 305419896>>>':'__hlsl_spirv_type<123, 0, 0, vk::Literal<vk::integral_constant<uint, 305419896>>>'
 vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 0x12345678>>> CValue;
 
-// CHECK: TypeAliasDecl 0x{{.+}} <{{.+}}:18:1, col:72> col:7 referenced Array 'vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>':'__hlsl_spirv_type<28U, 0, 0, T, vk::integral_constant<uint, L>>'
+// CHECK: TypeAliasDecl 0x{{.+}} <{{.+}}:20:1, col:72> col:7 referenced Array 'vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>':'__hlsl_spirv_type<28U, 0, 0, T, vk::integral_constant<uint, L>>'
 template <class T, uint L>
 using Array = vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:21:1, col:16> col:16 DValue 'Array<uint, 5>':'__hlsl_spirv_type<28, 0, 0, uint, vk::integral_constant<unsigned int, 5>>'
+// CHECK: VarDecl 0x{{.+}} <{{.+}}:23:1, col:16> col:16 DValue 'Array<uint, 5>':'__hlsl_spirv_type<28, 0, 0, uint, vk::integral_constant<unsigned int, 5>>'
 Array<uint, 5> DValue;
 
 [numthreads(1, 1, 1)]
diff --git a/clang/test/AST/HLSL/cbuffer.hlsl b/clang/test/AST/HLSL/cbuffer.hlsl
index 0332600a073e1..20cf7ecbda689 100644
--- a/clang/test/AST/HLSL/cbuffer.hlsl
+++ b/clang/test/AST/HLSL/cbuffer.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct EmptyStruct {
 };
 
diff --git a/clang/test/AST/HLSL/default_cbuffer.hlsl b/clang/test/AST/HLSL/default_cbuffer.hlsl
index 2c3a5911d1041..51b78412fd325 100644
--- a/clang/test/AST/HLSL/default_cbuffer.hlsl
+++ b/clang/test/AST/HLSL/default_cbuffer.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct EmptyStruct {
 };
 
diff --git a/clang/test/AST/HLSL/implicit-using-namespace.hlsl b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
new file mode 100644
index 0000000000000..e80219e815c3c
--- /dev/null
+++ b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2015 -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2016 -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2017 -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2018 -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2021 -ast-dump %s | FileCheck %s
+
+// CHECK: UsingDirectiveDecl {{.*}} <<invalid sloc>> <invalid sloc> Namespace {{.*}} 'hlsl'
+// CHECK: ParmVarDecl {{.*}} Value 'vector<float, 2>'
+void test(vector<float, 2> Value);
diff --git a/clang/test/AST/HLSL/is_structured_resource_element_compatible_concept.hlsl b/clang/test/AST/HLSL/is_structured_resource_element_compatible_concept.hlsl
index e7945650f9976..b96e5fcefb024 100644
--- a/clang/test/AST/HLSL/is_structured_resource_element_compatible_concept.hlsl
+++ b/clang/test/AST/HLSL/is_structured_resource_element_compatible_concept.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -ast-dump-filter=__is_structured_resource_element_compatible %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: ConceptDecl {{.*}} __is_structured_resource_element_compatible
 // CHECK: |-TemplateTypeParmDecl {{.*}} referenced typename depth 0 index 0 element_type
 // CHECK: `-BinaryOperator {{.*}} 'bool' lvalue '&&'
diff --git a/clang/test/AST/HLSL/is_typed_resource_element_compatible_concept.hlsl b/clang/test/AST/HLSL/is_typed_resource_element_compatible_concept.hlsl
index 494b4fb0bc559..f823f949df1dd 100644
--- a/clang/test/AST/HLSL/is_typed_resource_element_compatible_concept.hlsl
+++ b/clang/test/AST/HLSL/is_typed_resource_element_compatible_concept.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -ast-dump-filter=__is_typed_resource_element_compatible %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: ConceptDecl {{.*}} __is_typed_resource_element_compatible
 // CHECK: |-TemplateTypeParmDecl {{.*}} referenced typename depth 0 index 0 element_type
 // CHECK:  `-TypeTraitExpr {{.*}} 'bool' __builtin_hlsl_is_typed_resource_element_compatible
diff --git a/clang/test/AST/HLSL/matrix-alias.hlsl b/clang/test/AST/HLSL/matrix-alias.hlsl
index f922683e7b2fc..78e51f1653ae9 100644
--- a/clang/test/AST/HLSL/matrix-alias.hlsl
+++ b/clang/test/AST/HLSL/matrix-alias.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -hlsl-entry entry -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // Test that matrix aliases are set up properly for HLSL
 
 // CHECK: NamespaceDecl 0x{{[0-9a-fA-F]+}} <<invalid sloc>> <invalid sloc> implicit referenced hlsl
@@ -18,32 +20,32 @@
 // CHECK-SAME: NonTypeTemplateParm 0x{{[0-9a-fA-F]+}} 'element_count' 'int'
 
 // Make sure we got a using directive at the end.
-// CHECK: UsingDirectiveDecl 0x{{[0-9a-fA-F]+}} <<invalid sloc>> <invalid sloc> Namespace 0x{{[0-9a-fA-F]+}} 'hlsl'
+// CHECK: UsingDirectiveDecl {{.*}} Namespace {{.*}} 'hlsl'
 
 [shader("compute"), numthreads(1,1,1)]
 void entry() {
   // Verify that the alias is generated inside the hlsl namespace.
   hlsl::matrix<float, 2, 2> Mat2x2f;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:26:3, col:36>
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:28:3, col:36>
   // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:29> col:29 Mat2x2f 'hlsl::matrix<float, 2, 2>'
 
   // Verify that you don't need to specify the namespace.
   matrix<int, 2, 2> Mat2x2i;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:32:3, col:28>
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:34:3, col:28>
   // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:21> col:21 Mat2x2i 'matrix<int, 2, 2>'
 
   // Build a bigger matrix.
   matrix<double, 4, 4> Mat4x4d;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:38:3, col:31>
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:40:3, col:31>
   // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:24> col:24 Mat4x4d 'matrix<double, 4, 4>'
 
   // Verify that the implicit arguments generate the correct type.
   matrix<> ImpMat4x4;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:44:3, col:21>
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:46:3, col:21>
   // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:12> col:12 ImpMat4x4 'matrix<>':'matrix<float, 4, 4>'
   return;
 }
diff --git a/clang/test/AST/HLSL/matrix-elementexpr-tree-transform.hlsl b/clang/test/AST/HLSL/matrix-elementexpr-tree-transform.hlsl
index b88a781e63f38..0d672d4fd68e2 100644
--- a/clang/test/AST/HLSL/matrix-elementexpr-tree-transform.hlsl
+++ b/clang/test/AST/HLSL/matrix-elementexpr-tree-transform.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -std=hlsl202x \
 // RUN:   -finclude-default-header -ast-dump -ast-dump-filter=get00 %s | FileCheck %s
 
+using namespace hlsl;
+
 template <typename T>
 T get00(matrix<T, 2, 2> m) {
   return m._m00;
diff --git a/clang/test/AST/HLSL/matrix-init-list-row-major.hlsl b/clang/test/AST/HLSL/matrix-init-list-row-major.hlsl
index 4c59d4e4df8b9..71f01e18f50c1 100644
--- a/clang/test/AST/HLSL/matrix-init-list-row-major.hlsl
+++ b/clang/test/AST/HLSL/matrix-init-list-row-major.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies that matrix initializer lists in HLSL use row-major
 // element ordering. The elements in the AST InitListExpr remain in
 // row-major order as written in the source code.
diff --git a/clang/test/AST/HLSL/matrix-single-subscript-getter.hlsl b/clang/test/AST/HLSL/matrix-single-subscript-getter.hlsl
index 5481e0759ffbf..0a8b3dc637945 100644
--- a/clang/test/AST/HLSL/matrix-single-subscript-getter.hlsl
+++ b/clang/test/AST/HLSL/matrix-single-subscript-getter.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -ast-dump -o - %s | FileCheck %s 
 
+using namespace hlsl;
+
 typedef float float4x4 __attribute__((matrix_type(4,4)));
 typedef int int4x4 __attribute__((matrix_type(4,4)));
 
diff --git a/clang/test/AST/HLSL/matrix_layout_attr.hlsl b/clang/test/AST/HLSL/matrix_layout_attr.hlsl
index f10aea99e35df..12d1b00794f13 100644
--- a/clang/test/AST/HLSL/matrix_layout_attr.hlsl
+++ b/clang/test/AST/HLSL/matrix_layout_attr.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header \
 // RUN:   -std=hlsl202x -include-pch %t -ast-dump-all -x hlsl %S/Inputs/empty.hlsl | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: VarDecl {{.*}} rm_mat 'float3x3 hlsl_constant __attribute__((row_major))':'matrix<float, 3, 3> hlsl_constant'
 row_major float3x3 rm_mat;
 // CHECK: VarDecl {{.*}} cm_mat 'float4x4 hlsl_constant __attribute__((column_major))':'matrix<float, 4, 4> hlsl_constant'
diff --git a/clang/test/AST/HLSL/packoffset.hlsl b/clang/test/AST/HLSL/packoffset.hlsl
index 05b927279e198..1c6d6ff8cafe2 100644
--- a/clang/test/AST/HLSL/packoffset.hlsl
+++ b/clang/test/AST/HLSL/packoffset.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.3-library -S -finclude-default-header -fnative-half-type -fnative-int16-type -ast-dump  -x hlsl %s | FileCheck %s
 
+using namespace hlsl;
+
 
 // CHECK: HLSLBufferDecl {{.*}} cbuffer A
 cbuffer A
diff --git a/clang/test/AST/HLSL/pch.hlsl b/clang/test/AST/HLSL/pch.hlsl
index 5851c3104baf7..96563dbc82e4e 100644
--- a/clang/test/AST/HLSL/pch.hlsl
+++ b/clang/test/AST/HLSL/pch.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -emit-pch -o %t %S/Inputs/pch.hlsl
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -include-pch %t -ast-dump-all %s | FileCheck  %s
 
+using namespace hlsl;
+
 // Make sure PCH works by using function declared in PCH header and declare a RWBuffer in current file.
 // CHECK:FunctionDecl 0x[[FOO:[0-9a-f]+]] <{{.*}}:2:1, line:4:1> line:2:8 imported used foo 'float2 (float2, float2)'
 // CHECK:VarDecl 0x{{[0-9a-f]+}} <{{.*}}:{{[0-9]+}}:1, col:23> col:23 Buffer 'hlsl::RWBuffer<float>'
diff --git a/clang/test/AST/HLSL/pch_spirv_type.hlsl b/clang/test/AST/HLSL/pch_spirv_type.hlsl
index 5b34956d0db1c..8b453810f16b0 100644
--- a/clang/test/AST/HLSL/pch_spirv_type.hlsl
+++ b/clang/test/AST/HLSL/pch_spirv_type.hlsl
@@ -4,9 +4,11 @@
 // RUN:  -finclude-default-header -include-pch %t -ast-dump-all %s \
 // RUN: | FileCheck  %s
 
+using namespace hlsl;
+
 // Make sure PCH works by using function declared in PCH header and declare a SpirvType in current file.
 // CHECK:FunctionDecl 0x[[FOO:[0-9a-f]+]] <{{.*}}:2:1, line:4:1> line:2:8 imported used foo 'float2 (float2, float2)'
-// CHECK:VarDecl 0x{{[0-9a-f]+}} <{{.*}}:10:1, col:92> col:92 buffers2 'vk::SpirvOpaqueType<28, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<28, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK:VarDecl 0x{{[0-9a-f]+}} <{{.*}}:12:1, col:92> col:92 buffers2 'vk::SpirvOpaqueType<28, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<28, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 vk::SpirvOpaqueType</* OpTypeArray */ 28, RWBuffer<float>, vk::integral_constant<uint, 4>> buffers2;
 
 float2 bar(float2 a, float2 b) {
diff --git a/clang/test/AST/HLSL/pch_with_buf.hlsl b/clang/test/AST/HLSL/pch_with_buf.hlsl
index 93042a98e2d54..546739a4cc287 100644
--- a/clang/test/AST/HLSL/pch_with_buf.hlsl
+++ b/clang/test/AST/HLSL/pch_with_buf.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -emit-pch -o %t %S/Inputs/pch_with_buf.hlsl
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -include-pch %t -ast-dump-all %s | FileCheck  %s
 
+using namespace hlsl;
+
 // Make sure PCH works by using function declared in PCH header.
 // CHECK:FunctionDecl 0x[[FOO:[0-9a-f]+]] <{{.*}}:2:1, line:4:1> line:2:8 imported used foo 'float2 (float2, float2)'
 // Make sure buffer defined in PCH works.
diff --git a/clang/test/AST/HLSL/pch_with_matrix_element_accessor.hlsl b/clang/test/AST/HLSL/pch_with_matrix_element_accessor.hlsl
index 18446296675a7..2e1310a5d304f 100644
--- a/clang/test/AST/HLSL/pch_with_matrix_element_accessor.hlsl
+++ b/clang/test/AST/HLSL/pch_with_matrix_element_accessor.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -emit-pch -o %t %S/Inputs/pch.hlsl
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -include-pch %t -ast-dump-all %s | FileCheck  %s
 
+using namespace hlsl;
+
 float4x4 gM;
 
 // CHECK: FunctionDecl {{.*}} getDiag 'float4 ()'
diff --git a/clang/test/AST/HLSL/pch_with_matrix_single_subscript.hlsl b/clang/test/AST/HLSL/pch_with_matrix_single_subscript.hlsl
index feccd64c5f86d..d29fb4e9fdc7e 100644
--- a/clang/test/AST/HLSL/pch_with_matrix_single_subscript.hlsl
+++ b/clang/test/AST/HLSL/pch_with_matrix_single_subscript.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -emit-pch -o %t %S/Inputs/pch.hlsl
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -include-pch %t -ast-dump-all %s | FileCheck  %s
 
+using namespace hlsl;
+
 float3x2 gM;
 
 // CHECK: FunctionDecl {{.*}} getRow 'float2 (uint)'
diff --git a/clang/test/AST/HLSL/private.hlsl b/clang/test/AST/HLSL/private.hlsl
index ba7380ec3cfda..0e905d91dc7e5 100644
--- a/clang/test/AST/HLSL/private.hlsl
+++ b/clang/test/AST/HLSL/private.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: VarDecl {{.*}} global_scalar 'hlsl_private int' static cinit
 static int global_scalar = 0;
 
diff --git a/clang/test/AST/HLSL/resource_binding_attr.hlsl b/clang/test/AST/HLSL/resource_binding_attr.hlsl
index bd7ecf83f4125..0e4dfd20307f4 100644
--- a/clang/test/AST/HLSL/resource_binding_attr.hlsl
+++ b/clang/test/AST/HLSL/resource_binding_attr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -ast-dump -o - %s | FileCheck %s -check-prefixes=CHECK,DXIL
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan-library -finclude-default-header -ast-dump -o - %s | FileCheck %s -check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // CHECK: HLSLBufferDecl {{.*}} line:[[# @LINE + 4]]:9 cbuffer CB
 // CHECK-NEXT: HLSLResourceClassAttr {{.*}} Implicit CBuffer
 // CHECK-NEXT: HLSLResourceBindingAttr {{.*}} "b3" "space2"
diff --git a/clang/test/AST/HLSL/resources-in-structs-errors.hlsl b/clang/test/AST/HLSL/resources-in-structs-errors.hlsl
index f12343afd904f..9f17b49bb3bc7 100644
--- a/clang/test/AST/HLSL/resources-in-structs-errors.hlsl
+++ b/clang/test/AST/HLSL/resources-in-structs-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -verify %s
 
+using namespace hlsl;
+
 struct A {
   RWBuffer<float> Buf;
 };
diff --git a/clang/test/AST/HLSL/resources-in-structs-method-call.hlsl b/clang/test/AST/HLSL/resources-in-structs-method-call.hlsl
index ef8be74671533..7d0891f3b93b0 100644
--- a/clang/test/AST/HLSL/resources-in-structs-method-call.hlsl
+++ b/clang/test/AST/HLSL/resources-in-structs-method-call.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 struct MyStruct {
   float f;
   RWBuffer<float> Buf;
diff --git a/clang/test/AST/HLSL/resources-in-structs.hlsl b/clang/test/AST/HLSL/resources-in-structs.hlsl
index a0ded917f927c..62ab25ceed71e 100644
--- a/clang/test/AST/HLSL/resources-in-structs.hlsl
+++ b/clang/test/AST/HLSL/resources-in-structs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -ast-dump %s | FileCheck %s -check-prefixes=CHECK,DXIL
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan-library -ast-dump %s | FileCheck %s -check-prefixes=CHECK,SPIRV
 
+using namespace hlsl;
+
 // Single resource field in struct
 
 // CHECK: CXXRecordDecl {{.*}} struct A
diff --git a/clang/test/AST/HLSL/semantic-input.hlsl b/clang/test/AST/HLSL/semantic-input.hlsl
index 4dc3ab9db7392..f704311057e1a 100644
--- a/clang/test/AST/HLSL/semantic-input.hlsl
+++ b/clang/test/AST/HLSL/semantic-input.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -finclude-default-header -ast-dump -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-vertex -finclude-default-header -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK:      ParmVarDecl {{.*}} a 'float4':'vector<float, 4>'
 // CHECK-NEXT: HLSLParsedSemanticAttr {{.*}} "ABC" 0
 // CHECK-NEXT: HLSLAppliedSemanticAttr {{.*}} "ABC" 0
diff --git a/clang/test/AST/HLSL/semantic-output.hlsl b/clang/test/AST/HLSL/semantic-output.hlsl
index 63429387f8d66..7ea9ac0ad33af 100644
--- a/clang/test/AST/HLSL/semantic-output.hlsl
+++ b/clang/test/AST/HLSL/semantic-output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -finclude-default-header -ast-dump -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-vertex -finclude-default-header -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: FunctionDecl {{.*}} main 'uint ()'
 // CHECK:  HLSLParsedSemanticAttr {{.*}} "ABC" 0
 // CHECK:  HLSLAppliedSemanticAttr {{.*}} "ABC" 0
diff --git a/clang/test/AST/HLSL/vector-alias.hlsl b/clang/test/AST/HLSL/vector-alias.hlsl
index f3d28d6d3d55e..2e8e8f8e94f48 100644
--- a/clang/test/AST/HLSL/vector-alias.hlsl
+++ b/clang/test/AST/HLSL/vector-alias.hlsl
@@ -14,6 +14,8 @@
 // CHECK-NEXT: DeclRefExpr {{.*}} 'int' lvalue
 // NonTypeTemplateParm {{.*}} 'element_count' 'int'
 
+using namespace hlsl;
+
 // Make sure we got a using directive at the end.
 // CHECK: UsingDirectiveDecl {{.*}} Namespace {{.*}} 'hlsl'
 
diff --git a/clang/test/AST/HLSL/vk.spec-constant.usage.hlsl b/clang/test/AST/HLSL/vk.spec-constant.usage.hlsl
index a7e8223a325e6..d7aec97fe2c8e 100644
--- a/clang/test/AST/HLSL/vk.spec-constant.usage.hlsl
+++ b/clang/test/AST/HLSL/vk.spec-constant.usage.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -fnative-int16-type -triple spirv-unknown-vulkan-library -x hlsl -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: VarDecl {{.*}} bool_const 'const hlsl_private bool' static cinit
 // CHECK-NEXT: CallExpr {{.*}} 'bool'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'bool (*)(unsigned int, bool) noexcept' <FunctionToPointerDecay>
diff --git a/clang/test/AST/HLSL/vk_binding_attr.hlsl b/clang/test/AST/HLSL/vk_binding_attr.hlsl
index da5a42c2780a1..edf38a2c7a8bc 100644
--- a/clang/test/AST/HLSL/vk_binding_attr.hlsl
+++ b/clang/test/AST/HLSL/vk_binding_attr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-library -finclude-default-header -ast-dump -o - %s | FileCheck %s -check-prefixes=SPV,CHECK
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -finclude-default-header -ast-dump -o - %s | FileCheck %s -check-prefixes=DXIL,CHECK
 
+using namespace hlsl;
+
 // CHECK: VarDecl {{.*}} Buf 'StructuredBuffer<float>':'hlsl::StructuredBuffer<float>'
 // CHECK-NEXT: CallExpr {{.*}} 'StructuredBuffer<float>':'hlsl::StructuredBuffer<float>'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'hlsl::StructuredBuffer<float> (*)(unsigned int, unsigned int, int, unsigned int, const char *)' <FunctionToPointerDecay>
diff --git a/clang/test/CodeGenHLSL/ArrayAssignable.hlsl b/clang/test/CodeGenHLSL/ArrayAssignable.hlsl
index 2ff42120a3d18..60e576ab6e8de 100644
--- a/clang/test/CodeGenHLSL/ArrayAssignable.hlsl
+++ b/clang/test/CodeGenHLSL/ArrayAssignable.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   int x;
   float f;
diff --git a/clang/test/CodeGenHLSL/ArrayAssignable.logicalptr.hlsl b/clang/test/CodeGenHLSL/ArrayAssignable.logicalptr.hlsl
index cda023b16f891..5687747d6c7f5 100644
--- a/clang/test/CodeGenHLSL/ArrayAssignable.logicalptr.hlsl
+++ b/clang/test/CodeGenHLSL/ArrayAssignable.logicalptr.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s -fexperimental-logical-pointer | FileCheck %s --check-prefixes=CHECK-DXIL
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s -fexperimental-logical-pointer | FileCheck %s --check-prefixes=CHECK-SPIR
 
+using namespace hlsl;
+
 struct S {
   int x;
   float f;
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/AggregateSplatCast.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/AggregateSplatCast.hlsl
index cf144bb0f87b3..ecdec872817cf 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/AggregateSplatCast.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/AggregateSplatCast.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // array splat
 // CHECK-LABEL: define void {{.*}}call4
 // CHECK: [[B:%.*]] = alloca [2 x i32], align 4
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/ArrayElementwiseCast.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/ArrayElementwiseCast.hlsl
index 9e6f31d9e68be..7165c6e133ee7 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/ArrayElementwiseCast.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/ArrayElementwiseCast.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // array truncation to a scalar
 // CHECK-LABEL: define void {{.*}}call0
 // CHECK: [[A:%.*]] = alloca [2 x i32], align 4
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/ArrayOutputArguments.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/ArrayOutputArguments.hlsl
index 4571649717d8a..9afb2a70d7425 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/ArrayOutputArguments.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/ArrayOutputArguments.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: increment
 void increment(inout int Arr[2]) {
   for (int I = 0; I < 2; I++)
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/InitLists.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/InitLists.hlsl
index 3466866e9c124..cf899dd8af8de 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/InitLists.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/InitLists.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 5
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct TwoFloats {
   float X, Y;
 };
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixComparisonOperators.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixComparisonOperators.hlsl
index 94ea87166d3b0..af8d9f08af882 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixComparisonOperators.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixComparisonOperators.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // ==================================================================
 // Float Matrix vs Float Matrix
 // ==================================================================
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixConstructor.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixConstructor.hlsl
index e528cf3bf797c..ca7f67f246e08 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixConstructor.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixConstructor.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) <6 x float> @_Z5case1v(
 // CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementRowColFlags.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementRowColFlags.hlsl
index 9a3de766a8fb6..47efb558678d6 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementRowColFlags.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementRowColFlags.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major \
 // RUN:   -o - %s | FileCheck %s --check-prefixes=CHECK,ROW
 
+using namespace hlsl;
+
 // For a float3x2 matrix (3 rows, 2 columns):
 //   Column-major flat vector: [_11, _21, _31, _12, _22, _32]
 //                         idx:  0    1    2    3    4    5
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementTypeCast.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementTypeCast.hlsl
index 126b4d238ada1..0b0f0d7d4403b 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementTypeCast.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixElementTypeCast.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -fnative-half-type -fnative-int16-type -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -fnative-half-type -fnative-int16-type -fmatrix-memory-layout=column-major -o - %s | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 
+using namespace hlsl;
+
 
 // ROW-CHECK-LABEL: define hidden noundef <6 x i32> @_Z22elementwise_type_cast0u11matrix_typeILm3ELm2EfE(
 // ROW-CHECK-SAME: <6 x float> noundef nofpclass(nan inf) [[F32:%.*]]) #[[ATTR0:[0-9]+]] {
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixExplicitTruncation.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixExplicitTruncation.hlsl
index 85dd38f8b2647..30d6ebfb16634 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixExplicitTruncation.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixExplicitTruncation.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -fmatrix-memory-layout=column-major -o - %s | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 
+using namespace hlsl;
+
 // ROW-CHECK-LABEL: define hidden noundef <12 x i32> @_Z10trunc_castu11matrix_typeILm4ELm4EiE(
 // ROW-CHECK-SAME: <16 x i32> noundef [[I44:%.*]]) #[[ATTR0:[0-9]+]] {
 // ROW-CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixImplicitTruncation.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixImplicitTruncation.hlsl
index 05de54a6f0145..3f083e8ff31a7 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixImplicitTruncation.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixImplicitTruncation.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -fmatrix-memory-layout=column-major -o - %s | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 
+using namespace hlsl;
+
 // ROW-CHECK-LABEL: define hidden noundef <12 x i32> @_Z10trunc_castu11matrix_typeILm4ELm4EiE(
 // ROW-CHECK-SAME: <16 x i32> noundef [[I44:%.*]]) #[[ATTR0:[0-9]+]] {
 // ROW-CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixInitializerListOrder.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixInitializerListOrder.hlsl
index 0e972ff83ae8f..644d181d7e4a9 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixInitializerListOrder.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixInitializerListOrder.hlsl
@@ -4,6 +4,8 @@
 // RUN:   -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major -o - %s \
 // RUN:   | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 
+using namespace hlsl;
+
 // Verify that matrix initializer lists produce values in canonical column-major
 // register layout. The initializer list {1,2,3,4,5,6} for a float2x3 (2 rows,
 // 3 cols) is in row-major order: row0=[1,2,3], row1=[4,5,6].
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptConstSwizzle.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptConstSwizzle.hlsl
index 3df51ea6a606a..902f2220de1d5 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptConstSwizzle.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptConstSwizzle.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z10setMatrix1Ru11matrix_typeILm4ELm4EfEDv4_f(
 // CHECK-SAME: ptr noalias noundef nonnull align 4 dereferenceable(64) [[M:%.*]], <4 x float> noundef nofpclass(nan inf) [[V:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptDynamicSwizzle.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptDynamicSwizzle.hlsl
index cf8f2faad8135..e9d59a58388e7 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptDynamicSwizzle.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptDynamicSwizzle.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z9setMatrixRu11matrix_typeILm4ELm4EfEiDv4_f(
 // CHECK-SAME: ptr noalias noundef nonnull align 4 dereferenceable(64) [[M:%.*]], i32 noundef [[INDEX:%.*]], <4 x float> noundef nofpclass(nan inf) [[V:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptGetter.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptGetter.hlsl
index a23c2807f6477..f0baf18bd0964 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptGetter.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptGetter.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) <4 x float> @_Z24getFloatVecMatrixDynamicu11matrix_typeILm4ELm4EfEi(
 // CHECK-SAME: <16 x float> noundef nofpclass(nan inf) [[M:%.*]], i32 noundef [[INDEX:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptSetter.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptSetter.hlsl
index 8ef0e49b62112..2249646134db2 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptSetter.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSingleSubscriptSetter.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z9setMatrixRu11matrix_typeILm4ELm4EfEiDv4_f(
 // CHECK-SAME: ptr noalias noundef nonnull align 4 dereferenceable(64) [[M:%.*]], i32 noundef [[INDEX:%.*]], <4 x float> noundef nofpclass(nan inf) [[V:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSplat.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSplat.hlsl
index 39b1f5d879f4b..2e1a6249f73a2 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixSplat.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixSplat.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z13ConstantSplatv(
 // CHECK-SAME: ) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/MatrixToAndFromVectorConstructors.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/MatrixToAndFromVectorConstructors.hlsl
index 0c163dcb0ba24..f9efaa61b5fd0 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/MatrixToAndFromVectorConstructors.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/MatrixToAndFromVectorConstructors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - -fmatrix-memory-layout=column-major %s | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - -fmatrix-memory-layout=row-major %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) <4 x float> @_Z2fnu11matrix_typeILm2ELm2EfE(
 // CHECK-SAME: <4 x float> noundef nofpclass(nan inf) [[M:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/OutputArguments.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/OutputArguments.hlsl
index 12e900cd34ec2..5ceaa4c931ecb 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/OutputArguments.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/OutputArguments.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -emit-llvm -finclude-default-header -o - %s | FileCheck %s --check-prefixes=CHECK,ALL
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -O3 -emit-llvm -finclude-default-header -o - %s | FileCheck %s --check-prefixes=OPT,ALL
 
+using namespace hlsl;
+
 // Case 1: Simple floating integral conversion.
 // In this test case a float value is passed to an inout parameter taking an
 // integer. It is converted to an integer on call and converted back after the
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/StructElementwiseCast.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/StructElementwiseCast.hlsl
index 9c284d73d068c..366af64b98dae 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/StructElementwiseCast.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/StructElementwiseCast.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -fnative-half-type -fnative-int16-type -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   int X;
   float Y;
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/VectorElementwiseCast.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/VectorElementwiseCast.hlsl
index 09af847e25f62..caed166ff6240 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/VectorElementwiseCast.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/VectorElementwiseCast.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=column-major -o - %s | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 
+using namespace hlsl;
+
 // vector flat cast from array
 // CHECK-LABEL: define void {{.*}}call2
 // CHECK: [[A:%.*]] = alloca [2 x [1 x i32]], align 4
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/frem_modulo.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/frem_modulo.hlsl
index 93543ff8e9a77..d18a5dd740376 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/frem_modulo.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/frem_modulo.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s
 
+using namespace hlsl;
+
  half2 half_vec_mod_by_int(half2 p1) {
 // CHECK-LABEL: half_vec_mod_by_int
 // CHECK: %rem = frem reassoc nnan ninf nsz arcp afn <2 x half> %{{.*}}, splat (half 2.000000e+00)
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/matrix-type-indexing.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/matrix-type-indexing.hlsl
index 85c65d14616a5..d4ba0b716c181 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/matrix-type-indexing.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/matrix-type-indexing.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=column-major -o - | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s --check-prefixes=CHECK,COL-CHECK
 
+using namespace hlsl;
+
 RWBuffer<int> Out : register(u1);
 half2x3 gM;
 
diff --git a/clang/test/CodeGenHLSL/BasicFeatures/standard_conversion_sequences.hlsl b/clang/test/CodeGenHLSL/BasicFeatures/standard_conversion_sequences.hlsl
index 6770efefe94fe..00d11a1fe5361 100644
--- a/clang/test/CodeGenHLSL/BasicFeatures/standard_conversion_sequences.hlsl
+++ b/clang/test/CodeGenHLSL/BasicFeatures/standard_conversion_sequences.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: f3_to_d4
 // CHECK: [[f3:%.*]] = alloca <3 x float>
 // CHECK: [[d4:%.*]] = alloca <4 x double>
diff --git a/clang/test/CodeGenHLSL/BoolMatrix.hlsl b/clang/test/CodeGenHLSL/BoolMatrix.hlsl
index 65e4a0b962a09..40547b10d62ec 100644
--- a/clang/test/CodeGenHLSL/BoolMatrix.hlsl
+++ b/clang/test/CodeGenHLSL/BoolMatrix.hlsl
@@ -1,6 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 
 struct S {
     bool2x2 bM;
diff --git a/clang/test/CodeGenHLSL/BoolVector.hlsl b/clang/test/CodeGenHLSL/BoolVector.hlsl
index 3ee605bf536a7..43f17142f8547 100644
--- a/clang/test/CodeGenHLSL/BoolVector.hlsl
+++ b/clang/test/CodeGenHLSL/BoolVector.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %struct.S = type { <2 x i32>, float }
 // CHECK: [[ConstS:@.*]] = private unnamed_addr constant %struct.S { <2 x i32> splat (i32 1), float 1.000000e+00 }, align 1
 // CHECK: [[ConstArr:.*]] = private unnamed_addr constant [2 x <2 x i32>] [<2 x i32> splat (i32 1), <2 x i32> zeroinitializer], align 4
diff --git a/clang/test/CodeGenHLSL/GlobalConstructorLib.hlsl b/clang/test/CodeGenHLSL/GlobalConstructorLib.hlsl
index 93d44924c97db..c13052280e278 100644
--- a/clang/test/CodeGenHLSL/GlobalConstructorLib.hlsl
+++ b/clang/test/CodeGenHLSL/GlobalConstructorLib.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -disable-llvm-passes %s -o - | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,NOINLINE
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -O0 %s -o - | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,INLINE
 
+using namespace hlsl;
+
 // Make sure global variable for ctors exist for lib profile.
 // CHECK:@llvm.global_ctors
 
diff --git a/clang/test/CodeGenHLSL/GlobalConstructors.hlsl b/clang/test/CodeGenHLSL/GlobalConstructors.hlsl
index cd79c9288987a..d832a16fd4636 100644
--- a/clang/test/CodeGenHLSL/GlobalConstructors.hlsl
+++ b/clang/test/CodeGenHLSL/GlobalConstructors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -emit-llvm -disable-llvm-passes %s -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWBuffer<float> Buffer;
 
 [numthreads(1,1,1)]
diff --git a/clang/test/CodeGenHLSL/Operators/half-vector-comparisons.hlsl b/clang/test/CodeGenHLSL/Operators/half-vector-comparisons.hlsl
index c289f372f4542..9d52a37a7bf73 100644
--- a/clang/test/CodeGenHLSL/Operators/half-vector-comparisons.hlsl
+++ b/clang/test/CodeGenHLSL/Operators/half-vector-comparisons.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s --check-prefixes=CHECK,NATIVE_HALF
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // Regression test for issue llvm/llvm-project#213814
 
 // CHECK-LABEL: test_lt
diff --git a/clang/test/CodeGenHLSL/Operators/logical-not.hlsl b/clang/test/CodeGenHLSL/Operators/logical-not.hlsl
index 7a2e61c2147e2..c0090879bd081 100644
--- a/clang/test/CodeGenHLSL/Operators/logical-not.hlsl
+++ b/clang/test/CodeGenHLSL/Operators/logical-not.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -disable-llvm-passes -emit-llvm -finclude-default-header -fnative-half-type -fnative-int16-type -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: case1
 // CHECK: [[ToBool:%.*]] = icmp ne <2 x i32> {{.*}}, zeroinitializer
 // CHECK-NEXT: [[BoolCmp:%.*]] = icmp eq <2 x i1> [[ToBool]], zeroinitializer
diff --git a/clang/test/CodeGenHLSL/bool-vector-load.hlsl b/clang/test/CodeGenHLSL/bool-vector-load.hlsl
index 3a4992da3f7cb..6b9f444c17e7a 100644
--- a/clang/test/CodeGenHLSL/bool-vector-load.hlsl
+++ b/clang/test/CodeGenHLSL/bool-vector-load.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_dxc -T cs_6_3 -Xclang -emit-llvm -Xclang -disable-llvm-passes %s | FileCheck %s
 // RUN: %clang_dxc -T cs_6_3 -Xclang -emit-llvm -Xclang -disable-llvm-passes -Xclang -load-bool-from-mem=truncate %s 2>&1 | FileCheck %s --check-prefix=CHECK,TRUNCATE
 
+using namespace hlsl;
+
 // TRUNCATE: -load-bool-from-mem=truncate ignored for HLSL (always nonzero)
 
 StructuredBuffer<bool4> In : register(t0);
diff --git a/clang/test/CodeGenHLSL/builtins/AddUint64.hlsl b/clang/test/CodeGenHLSL/builtins/AddUint64.hlsl
index ba866f90896c1..e9773bd4ca2a5 100644
--- a/clang/test/CodeGenHLSL/builtins/AddUint64.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/AddUint64.hlsl
@@ -3,6 +3,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK
 
+using namespace hlsl;
+
 
 // CHECK-LABEL: define hidden noundef <2 x i32> @_Z20test_AddUint64_uint2Dv2_jS_(
 // CHECK-SAME: <2 x i32> noundef [[A:%.*]], <2 x i32> noundef [[B:%.*]]) #[[ATTR0:[0-9]+]] {
diff --git a/clang/test/CodeGenHLSL/builtins/AllMemoryBarrier.hlsl b/clang/test/CodeGenHLSL/builtins/AllMemoryBarrier.hlsl
index 1b72a94de8ff3..62a7e90a66a18 100644
--- a/clang/test/CodeGenHLSL/builtins/AllMemoryBarrier.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/AllMemoryBarrier.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_AllMemoryBarrier() {
diff --git a/clang/test/CodeGenHLSL/builtins/AllMemoryBarrierWithGroupSync.hlsl b/clang/test/CodeGenHLSL/builtins/AllMemoryBarrierWithGroupSync.hlsl
index 9bf3286d84348..bd910ec8c2d98 100644
--- a/clang/test/CodeGenHLSL/builtins/AllMemoryBarrierWithGroupSync.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/AllMemoryBarrierWithGroupSync.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_AllMemoryBarrierWithGroupSync() {
diff --git a/clang/test/CodeGenHLSL/builtins/Barrier-all-memory.hlsl b/clang/test/CodeGenHLSL/builtins/Barrier-all-memory.hlsl
index 78255a1fcdd1e..56fdc44661700 100644
--- a/clang/test/CodeGenHLSL/builtins/Barrier-all-memory.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/Barrier-all-memory.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck \
 // RUN:   --check-prefix=COMPUTE %s
 
+using namespace hlsl;
+
 #ifdef VERTEX
 [shader("vertex")]
 float4 main() : SV_Position {
diff --git a/clang/test/CodeGenHLSL/builtins/Barrier.hlsl b/clang/test/CodeGenHLSL/builtins/Barrier.hlsl
index 6ddd95d6a922d..51204041be686 100644
--- a/clang/test/CodeGenHLSL/builtins/Barrier.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/Barrier.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.8-library %s -emit-llvm \
 // RUN:   -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 RWByteAddressBuffer Bytes;
 
diff --git a/clang/test/CodeGenHLSL/builtins/ConstantBuffer-layout.hlsl b/clang/test/CodeGenHLSL/builtins/ConstantBuffer-layout.hlsl
index 1cf65b83ab501..0fbd5195c041f 100644
--- a/clang/test/CodeGenHLSL/builtins/ConstantBuffer-layout.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ConstantBuffer-layout.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-vulkan-library %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // Scenario 1: Basic Padding (No row crossing).
 struct Basic {
   float3 a;
diff --git a/clang/test/CodeGenHLSL/builtins/ConstantBuffer.hlsl b/clang/test/CodeGenHLSL/builtins/ConstantBuffer.hlsl
index 98da603d864ae..82ba2c89288c0 100644
--- a/clang/test/CodeGenHLSL/builtins/ConstantBuffer.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ConstantBuffer.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-vulkan-library -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 struct S {
   float a;
   int b;
diff --git a/clang/test/CodeGenHLSL/builtins/D3DCOLORtoUBYTE4.hlsl b/clang/test/CodeGenHLSL/builtins/D3DCOLORtoUBYTE4.hlsl
index a712dc21843e9..7a74e439fda1d 100644
--- a/clang/test/CodeGenHLSL/builtins/D3DCOLORtoUBYTE4.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/D3DCOLORtoUBYTE4.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s --check-prefixes=CHECK %}
 
+using namespace hlsl;
+
 // CHECK-LABEL: D3DCOLORtoUBYTE4
 int4 test_D3DCOLORtoUBYTE4(float4 p1) {
   // CHECK: %[[SCALED:.*]] = fmul [[FMFLAGS:.*]][[FLOAT_TYPE:<4 x float>]] %{{.*}}, splat (float f0x437F0080)
diff --git a/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrier.hlsl b/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrier.hlsl
index 4f1bdd4a561a2..ca58b2a9215a1 100644
--- a/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrier.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrier.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_DeviceMemoryBarrier() {
diff --git a/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrierWithGroupSync.hlsl b/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrierWithGroupSync.hlsl
index 26417cd5bfbcb..9ef7eb16b3408 100644
--- a/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrierWithGroupSync.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/DeviceMemoryBarrierWithGroupSync.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_DeviceMemoryBarrierWithGroupSync() {
diff --git a/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrier.hlsl b/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrier.hlsl
index 37b8e85e94b49..ce05170e2707a 100644
--- a/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrier.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrier.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_GroupMemoryBarrier() {
diff --git a/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrierWithGroupSync.hlsl b/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrierWithGroupSync.hlsl
index 298fe9ec2722c..3b2c94938195d 100644
--- a/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrierWithGroupSync.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/GroupMemoryBarrierWithGroupSync.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   -DTARGET=spv -check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-DXIL: define hidden void @
 // CHECK-SPIRV: define hidden spir_func void @
 void test_GroupMemoryBarrierWithGroupSync() {
diff --git a/clang/test/CodeGenHLSL/builtins/InterlockedVectorElement.hlsl b/clang/test/CodeGenHLSL/builtins/InterlockedVectorElement.hlsl
index fd31c06706d14..bf16723cb9cb3 100644
--- a/clang/test/CodeGenHLSL/builtins/InterlockedVectorElement.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/InterlockedVectorElement.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/QuadAll.hlsl b/clang/test/CodeGenHLSL/builtins/QuadAll.hlsl
index 986178e8d9ab1..3a5fa83b7d9f5 100644
--- a/clang/test/CodeGenHLSL/builtins/QuadAll.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/QuadAll.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPIRV
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}}test_quad_all{{.*}}(
 // SPIRV: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
 // DXIL: %[[RET:.*]] = call i1 @llvm.dx.quad.all(i1 %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossDiagonal.hlsl b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossDiagonal.hlsl
index cac1805dddfd4..d7ea088eb837b 100644
--- a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossDiagonal.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossDiagonal.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,CHECK-NO_HALF -DTARGET=dx
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossX.hlsl b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossX.hlsl
index 24a63a8f8faa5..fe53771a09578 100644
--- a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossX.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossX.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,CHECK-NO_HALF -DTARGET=dx
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossY.hlsl b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossY.hlsl
index 8166971981922..39a89f4743b04 100644
--- a/clang/test/CodeGenHLSL/builtins/QuadReadAcrossY.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/QuadReadAcrossY.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL,CHECK-NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/RWBuffer-Interlocked.hlsl b/clang/test/CodeGenHLSL/builtins/RWBuffer-Interlocked.hlsl
index 603e081df841e..8a631e8fd753d 100644
--- a/clang/test/CodeGenHLSL/builtins/RWBuffer-Interlocked.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWBuffer-Interlocked.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-compute %s -emit-llvm -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAdd.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAdd.hlsl
index 5342c0a7c93f7..f61a775501c5b 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAdd.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAdd.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAnd.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAnd.hlsl
index f6f19f0580523..efed41817daae 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAnd.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedAnd.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchange.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchange.hlsl
index 1723761b56792..47e035ec0b516 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchange.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchange.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
index 912565da3400e..6ec8c7810aa6c 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStore.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStore.hlsl
index f1a520bd200a4..d59a5b032a0cb 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStore.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStore.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
index ca2f2b02cdaa4..6065e8599f9c8 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedExchange.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedExchange.hlsl
index 5185983e6b635..56b8b9906b575 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedExchange.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedExchange.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMax.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMax.hlsl
index 80d38171313b3..704fd07651f99 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMax.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMax.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMin.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMin.hlsl
index f81edc44a6745..a01276f037429 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedMin.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedOr.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedOr.hlsl
index b9c6bbb4dcdd5..be50f89f172d7 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedOr.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedOr.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedXor.hlsl b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedXor.hlsl
index 41cd077442d8e..42fd358b2a506 100644
--- a/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedXor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWByteAddressBuffer-InterlockedXor.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RWTexture-Interlocked.hlsl b/clang/test/CodeGenHLSL/builtins/RWTexture-Interlocked.hlsl
index ea9754b36184c..cf59f43008c7f 100644
--- a/clang/test/CodeGenHLSL/builtins/RWTexture-Interlocked.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RWTexture-Interlocked.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan1.3-compute %s -emit-llvm -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAdd.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAdd.hlsl
index 2d72d0b83d6bb..6cbb05d1e9168 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAdd.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAdd.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAnd.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAnd.hlsl
index 167f605a43303..6fca44b4d6f6b 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAnd.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedAnd.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchange.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchange.hlsl
index 83bfd4e35fc51..48ee20237058d 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchange.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchange.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet (asserts in clang/lib/CodeGen/Targets/SPIR.cpp on
 // `!ResAttrs.IsROV && "Rasterizer order views not implemented for SPIR-V yet"`).
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
index 67df534c00ae2..e81103d52be3b 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareExchangeFloatBitwise.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet (asserts in clang/lib/CodeGen/Targets/SPIR.cpp on
 // `!ResAttrs.IsROV && "Rasterizer order views not implemented for SPIR-V yet"`).
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStore.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStore.hlsl
index 6e99265a720f8..a24606031b7dd 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStore.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStore.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet (asserts in clang/lib/CodeGen/Targets/SPIR.cpp on
 // `!ResAttrs.IsROV && "Rasterizer order views not implemented for SPIR-V yet"`).
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
index 89162c57f416f..7ff8027c62410 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedCompareStoreFloatBitwise.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedExchange.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedExchange.hlsl
index c7576452cca73..42448e10b7727 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedExchange.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedExchange.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMax.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMax.hlsl
index feff81db418ea..6266c3f3e79f9 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMax.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMax.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMin.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMin.hlsl
index 291b04ebbea6f..3c754245bf353 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedMin.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedOr.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedOr.hlsl
index d3788b41a6945..987310ec898be 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedOr.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedOr.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedXor.hlsl b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedXor.hlsl
index 748b359760dac..de2dc7843a148 100644
--- a/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedXor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/RasterizerOrderedByteAddressBuffer-InterlockedXor.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.6-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 // SPIR-V codegen for RasterizerOrderedByteAddressBuffer is not implemented
 // yet. Add a `spirv-pc-vulkan1.3-library` RUN line here when SPIR-V ROV
 // support lands. See https://github.com/llvm/llvm-project/issues/124585.
diff --git a/clang/test/CodeGenHLSL/builtins/VectorElementStore.hlsl b/clang/test/CodeGenHLSL/builtins/VectorElementStore.hlsl
index cdce8867dcd94..c5aeb7fb80a50 100644
--- a/clang/test/CodeGenHLSL/builtins/VectorElementStore.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/VectorElementStore.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -emit-llvm -disable-llvm-passes  \
 // RUN:   -triple dxil-pc-shadermodel6.3-library %s -o - | FileCheck %s
 
+using namespace hlsl;
+
 // Test groupshared vector element store for uint.
 // CHECK-LABEL: test_uint4
 // CHECK: [[VAL:%.*]] = load i32, ptr %Val.addr, align 4
diff --git a/clang/test/CodeGenHLSL/builtins/VectorSwizzles.hlsl b/clang/test/CodeGenHLSL/builtins/VectorSwizzles.hlsl
index 94f9f58cfd29f..4e819d86685d1 100644
--- a/clang/test/CodeGenHLSL/builtins/VectorSwizzles.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/VectorSwizzles.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.3-library %s -disable-llvm-passes \
 // RUN:   -emit-llvm -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: Single
 
 // Setup local vars.
diff --git a/clang/test/CodeGenHLSL/builtins/WaveActiveAllTrue.hlsl b/clang/test/CodeGenHLSL/builtins/WaveActiveAllTrue.hlsl
index bc565bc6fea4c..b17bc78da11bc 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveActiveAllTrue.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveActiveAllTrue.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call for int values.
 
 // CHECK-LABEL: define {{.*}}test
diff --git a/clang/test/CodeGenHLSL/builtins/WaveActiveAnyTrue.hlsl b/clang/test/CodeGenHLSL/builtins/WaveActiveAnyTrue.hlsl
index 1262949d5f975..4673f7e09d4bb 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveActiveAnyTrue.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveActiveAnyTrue.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call for int values.
 
 // CHECK-LABEL: define {{.*}}test
diff --git a/clang/test/CodeGenHLSL/builtins/WaveActiveBallot.hlsl b/clang/test/CodeGenHLSL/builtins/WaveActiveBallot.hlsl
index 03d00502cef92..f47aaa654ecd1 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveActiveBallot.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveActiveBallot.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call for int values.
 
 // CHECK-LABEL: define {{.*}}test
diff --git a/clang/test/CodeGenHLSL/builtins/WaveActiveBitAnd-errors.hlsl b/clang/test/CodeGenHLSL/builtins/WaveActiveBitAnd-errors.hlsl
index f0e6020c7e6cd..dce54f2d91a4c 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveActiveBitAnd-errors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveActiveBitAnd-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint test_too_few_arg() {
   return __builtin_hlsl_wave_active_bit_and();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/CodeGenHLSL/builtins/WaveActiveBitXor-errors.hlsl b/clang/test/CodeGenHLSL/builtins/WaveActiveBitXor-errors.hlsl
index b5870fb61195d..61dccbbe72dc9 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveActiveBitXor-errors.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveActiveBitXor-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint test_too_few_arg() {
   return __builtin_hlsl_wave_active_bit_xor();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitAnd.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitAnd.hlsl
index d266d9752b847..62536918d92ff 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitAnd.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitAnd.hlsl
@@ -9,6 +9,8 @@
 // RUN:   -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s -DINTRINSIC=spv.subgroup.multi.prefix.bit.and
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_uint
 uint test_uint(uint value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitOr.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitOr.hlsl
index ce28f15ee5d05..d24ed9d10c821 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitOr.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitOr.hlsl
@@ -9,6 +9,8 @@
 // RUN:   -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s -DINTRINSIC=spv.subgroup.multi.prefix.bit.or
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_uint
 uint test_uint(uint value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitXor.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitXor.hlsl
index b903fe8a168cc..1a8444f784eb1 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitXor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixBitXor.hlsl
@@ -9,6 +9,8 @@
 // RUN:   -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s -DINTRINSIC=spv.subgroup.multi.prefix.bit.xor
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_uint
 uint test_uint(uint value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixCountBits.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixCountBits.hlsl
index 5c7175cdeb7f1..66a7ecda4809d 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixCountBits.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixCountBits.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -emit-llvm \
 // RUN:   -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_bool
 uint test_bool(bool value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixProduct.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixProduct.hlsl
index c6f5a119f1104..8eeb6590a5289 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixProduct.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixProduct.hlsl
@@ -11,6 +11,8 @@
 // RUN:   -DINTRINSIC=spv.subgroup.multi.prefix.product \
 // RUN:   -DUINTRINSIC=spv.subgroup.multi.prefix.product
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_float
 float test_float(float value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixSum.hlsl b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixSum.hlsl
index 943a90884521d..cd4f959601d00 100644
--- a/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixSum.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/WaveMultiPrefixSum.hlsl
@@ -11,6 +11,8 @@
 // RUN:   -DINTRINSIC=spv.subgroup.multi.prefix.sum \
 // RUN:   -DUINTRINSIC=spv.subgroup.multi.prefix.sum
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_float
 float test_float(float value, uint4 mask) {
   // CHECK: %[[TOKEN:.*]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/builtins/abs.hlsl b/clang/test/CodeGenHLSL/builtins/abs.hlsl
index 8a4b74bec3ac3..d1226882ab7a6 100644
--- a/clang/test/CodeGenHLSL/builtins/abs.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/abs.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 using hlsl::abs;
 
 #ifdef __HLSL_ENABLE_16_BIT
diff --git a/clang/test/CodeGenHLSL/builtins/abs_mat.hlsl b/clang/test/CodeGenHLSL/builtins/abs_mat.hlsl
index 2aa5b2df747e0..002d94e3c6b7b 100644
--- a/clang/test/CodeGenHLSL/builtins/abs_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/abs_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_abs_int2x3
 // CHECK: call <6 x i32> @llvm.abs.v6i32(<6 x i32> %{{.*}}, i1 false)
 int2x3 test_abs_int2x3(int2x3 p0) { return abs(p0); }
diff --git a/clang/test/CodeGenHLSL/builtins/acos-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/acos-overloads.hlsl
index 086235efeaaf0..63f41c7072ddb 100644
--- a/clang/test/CodeGenHLSL/builtins/acos-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/acos-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_acos_doubled(
 // CHECK:    [[V0:%.*]] = call token @llvm.experimental.convergence.entry()
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
diff --git a/clang/test/CodeGenHLSL/builtins/acos.hlsl b/clang/test/CodeGenHLSL/builtins/acos.hlsl
index a494731b77175..5819463bded15 100644
--- a/clang/test/CodeGenHLSL/builtins/acos.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/acos.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_acos_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.acos.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.acos.f32
diff --git a/clang/test/CodeGenHLSL/builtins/acos_mat.hlsl b/clang/test/CodeGenHLSL/builtins/acos_mat.hlsl
index 4a17209124f4e..026c3c83d7774 100644
--- a/clang/test/CodeGenHLSL/builtins/acos_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/acos_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_acos_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.acos.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.acos.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/all.hlsl b/clang/test/CodeGenHLSL/builtins/all.hlsl
index 37a5e957b8a00..c06983d78128a 100644
--- a/clang/test/CodeGenHLSL/builtins/all.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/all.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library \
 // RUN:   %s -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef i1 @{{.*}}test_all_half{{.*}}(half
 // CHECK: [[CMP:%.*]] = fcmp {{.*}} une half {{.*}}, 0.000000e+00
 // CHECK: ret i1 [[CMP]]
diff --git a/clang/test/CodeGenHLSL/builtins/and.hlsl b/clang/test/CodeGenHLSL/builtins/and.hlsl
index d2ca7cf4163ed..a43a8006a0139 100644
--- a/clang/test/CodeGenHLSL/builtins/and.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/and.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef i1 @_Z15test_and_scalarbb(
 // CHECK-SAME: i1 noundef [[X:%.*]], i1 noundef [[Y:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/and_mat.hlsl b/clang/test/CodeGenHLSL/builtins/and_mat.hlsl
index 66c87c5de9453..030f9d25983dc 100644
--- a/clang/test/CodeGenHLSL/builtins/and_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/and_mat.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef <2 x i1> @_Z16test_and_bool1x2u11matrix_typeILm1ELm2EbES_(
 // CHECK-SAME: <2 x i1> noundef [[X:%.*]], <2 x i1> noundef [[Y:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  entry:
diff --git a/clang/test/CodeGenHLSL/builtins/any.hlsl b/clang/test/CodeGenHLSL/builtins/any.hlsl
index e4b83730035b6..75c64fa2a21f0 100644
--- a/clang/test/CodeGenHLSL/builtins/any.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/any.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library \
 // RUN:   %s -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef i1 @{{.*}}test_any_half{{.*}}(half
 // CHECK: [[CMP:%.*]] = fcmp {{.*}} une half {{.*}}, 0.000000e+00
 // CHECK: ret i1 [[CMP]]
diff --git a/clang/test/CodeGenHLSL/builtins/asdouble.hlsl b/clang/test/CodeGenHLSL/builtins/asdouble.hlsl
index a509571cd8f54..433fe61b390f1 100644
--- a/clang/test/CodeGenHLSL/builtins/asdouble.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asdouble.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -disable-llvm-passes -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,CHECK-SPV
 
+using namespace hlsl;
+
 // Test lowering of asdouble expansion to shuffle/bitcast and splat when required
 
 // CHECK-LABEL: define {{.*}}test_uint
diff --git a/clang/test/CodeGenHLSL/builtins/asfloat.hlsl b/clang/test/CodeGenHLSL/builtins/asfloat.hlsl
index c9ef1f5011712..b792ff702b89e 100644
--- a/clang/test/CodeGenHLSL/builtins/asfloat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asfloat.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 // RUN: %if cir-enabled %{ %clang_cc1 -fclangir -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // CHECK: define {{.*}}test_uint{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}} 
 // CHECK: bitcast i32 [[VAL]] to float
 float test_uint(uint p0) {
diff --git a/clang/test/CodeGenHLSL/builtins/asfloat_mat.hlsl b/clang/test/CodeGenHLSL/builtins/asfloat_mat.hlsl
index 7e89034c4c0e6..91c2afec2d48c 100644
--- a/clang/test/CodeGenHLSL/builtins/asfloat_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asfloat_mat.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 
 // CHECK: define {{.*}}test_vector_uint{{.*}}(<16 x i32> {{.*}} [[VAL:%.*]]){{.*}} 
 // CHECK: bitcast <16 x i32> [[VAL]] to <16 x float>
diff --git a/clang/test/CodeGenHLSL/builtins/asin-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/asin-overloads.hlsl
index fa4b7632bfeac..048e7c5f588e3 100644
--- a/clang/test/CodeGenHLSL/builtins/asin-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asin-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_asin_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V3:%.*]] = call {{.*}} float @llvm.asin.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/asin.hlsl b/clang/test/CodeGenHLSL/builtins/asin.hlsl
index 45770a37b4fea..d764c5d27fb02 100644
--- a/clang/test/CodeGenHLSL/builtins/asin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asin.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_asin_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.asin.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.asin.f32
diff --git a/clang/test/CodeGenHLSL/builtins/asin_mat.hlsl b/clang/test/CodeGenHLSL/builtins/asin_mat.hlsl
index 2c59abd5d16cb..f5c711f094593 100644
--- a/clang/test/CodeGenHLSL/builtins/asin_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asin_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_asin_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.asin.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.asin.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/asint.hlsl b/clang/test/CodeGenHLSL/builtins/asint.hlsl
index 6e9c5f183ff15..896328ca5ebc5 100644
--- a/clang/test/CodeGenHLSL/builtins/asint.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 // RUN: %if cir-enabled %{ %clang_cc1 -fclangir -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // CHECK: define {{.*}}test_int{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
 // CHECK-NOT: bitcast
 // CHECK: ret i32 [[VAL]]
diff --git a/clang/test/CodeGenHLSL/builtins/asint16.hlsl b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
index fd2cb8d10ee6b..960acb6e879ce 100644
--- a/clang/test/CodeGenHLSL/builtins/asint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint16.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.2-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 //CHECK-LABEL: define {{.*}}test_ints
 //CHECK-SAME: {{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
 //CHECK-NOT: bitcast
diff --git a/clang/test/CodeGenHLSL/builtins/asint_mat.hlsl b/clang/test/CodeGenHLSL/builtins/asint_mat.hlsl
index aaeaf57f2ff45..c73cd9d512532 100644
--- a/clang/test/CodeGenHLSL/builtins/asint_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asint_mat.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: define {{.*}}test_vector_int{{.*}}(<16 x i32> {{.*}} [[VAL:%.*]]){{.*}}
 // CHECK-NOT: bitcast
 // CHECK: ret <16 x i32> [[VAL]]
diff --git a/clang/test/CodeGenHLSL/builtins/asuint.hlsl b/clang/test/CodeGenHLSL/builtins/asuint.hlsl
index 44f2a89346e95..a2498b2f192ef 100644
--- a/clang/test/CodeGenHLSL/builtins/asuint.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asuint.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 // RUN: %if cir-enabled %{ %clang_cc1 -fclangir -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // CHECK: define {{.*}}test_uint{{.*}}(i32 {{.*}} [[VAL:%.*]]){{.*}}
 // CHECK-NOT: bitcast
 // CHECK: ret i32 [[VAL]]
diff --git a/clang/test/CodeGenHLSL/builtins/asuint16.hlsl b/clang/test/CodeGenHLSL/builtins/asuint16.hlsl
index 31e151e210d7e..21c822a764910 100644
--- a/clang/test/CodeGenHLSL/builtins/asuint16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asuint16.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.2-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 //CHECK-LABEL: define {{.*}}test_ints
 //CHECK-SAME: {{.*}}(i16 {{.*}} [[VAL:%.*]]){{.*}}
 //CHECK-NOT: bitcast
diff --git a/clang/test/CodeGenHLSL/builtins/asuint_mat.hlsl b/clang/test/CodeGenHLSL/builtins/asuint_mat.hlsl
index 526e83cb18db1..fd02bef92adec 100644
--- a/clang/test/CodeGenHLSL/builtins/asuint_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/asuint_mat.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: define {{.*}}test_vector_uint{{.*}}(<16 x i32> {{.*}} [[VAL:%.*]]){{.*}}
 // CHECK-NOT: bitcast
 // CHECK: ret <16 x i32> [[VAL]]
diff --git a/clang/test/CodeGenHLSL/builtins/atan-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/atan-overloads.hlsl
index b3a539b0f4642..108c29b890abe 100644
--- a/clang/test/CodeGenHLSL/builtins/atan-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_atan_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V3:%.*]] = call {{.*}} float @llvm.atan.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/atan.hlsl b/clang/test/CodeGenHLSL/builtins/atan.hlsl
index 48383c71eefc1..86c469ac6dd41 100644
--- a/clang/test/CodeGenHLSL/builtins/atan.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_atan_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.atan.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.atan.f32
diff --git a/clang/test/CodeGenHLSL/builtins/atan2-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/atan2-overloads.hlsl
index 0a4b70943df1a..51dde83c3921e 100644
--- a/clang/test/CodeGenHLSL/builtins/atan2-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan2-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm  \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK -DFNATTRS="hidden spir_func noundef nofpclass(nan inf)" 
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z17test_atan2_doubledd(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[CONV1I:%.*]] = fptrunc {{.*}} double %{{.*}} to float
diff --git a/clang/test/CodeGenHLSL/builtins/atan2.hlsl b/clang/test/CodeGenHLSL/builtins/atan2.hlsl
index c781567697dc2..d9f68cea2f5d3 100644
--- a/clang/test/CodeGenHLSL/builtins/atan2.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan2.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_atan2_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.atan2.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.atan2.f32
diff --git a/clang/test/CodeGenHLSL/builtins/atan2_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/atan2_mat-overloads.hlsl
index e53504daeab5c..91d2392c0a549 100644
--- a/clang/test/CodeGenHLSL/builtins/atan2_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan2_mat-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm  \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK -DSPIR_FUNC="spir_func "
 
+using namespace hlsl;
+
 
 // CHECK: define hidden [[SPIR_FUNC]]noundef nofpclass(nan inf) <12 x float> @_{{.*}}test_atan2_double3x4{{.*}}(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} <12 x double> %{{.*}} to <12 x float>
diff --git a/clang/test/CodeGenHLSL/builtins/atan2_mat.hlsl b/clang/test/CodeGenHLSL/builtins/atan2_mat.hlsl
index d473dd1a9c48a..1fe49471dea54 100644
--- a/clang/test/CodeGenHLSL/builtins/atan2_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan2_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_atan2_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.atan2.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.atan2.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/atan_mat.hlsl b/clang/test/CodeGenHLSL/builtins/atan_mat.hlsl
index 2e69b86db02de..18c90b8b4a521 100644
--- a/clang/test/CodeGenHLSL/builtins/atan_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/atan_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_atan_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.atan.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.atan.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/ceil-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/ceil-overloads.hlsl
index 9bf1974481f04..533000581cfd2 100644
--- a/clang/test/CodeGenHLSL/builtins/ceil-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ceil-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:  -emit-llvm -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK -DFNATTRS="hidden noundef nofpclass(nan inf)"
 
+using namespace hlsl;
+
 using hlsl::ceil;
 
 // CHECK: define [[FNATTRS]] float @_Z16test_ceil_doubled(
diff --git a/clang/test/CodeGenHLSL/builtins/ceil.hlsl b/clang/test/CodeGenHLSL/builtins/ceil.hlsl
index 7f9ab17b38efa..18ff1ca20f63f 100644
--- a/clang/test/CodeGenHLSL/builtins/ceil.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ceil.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 using hlsl::ceil;
 
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z14test_ceil_half
diff --git a/clang/test/CodeGenHLSL/builtins/ceil_mat.hlsl b/clang/test/CodeGenHLSL/builtins/ceil_mat.hlsl
index f7a59115892b8..754f8cd301a63 100644
--- a/clang/test/CodeGenHLSL/builtins/ceil_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ceil_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_ceil_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.ceil.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.ceil.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/clamp-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/clamp-overloads.hlsl
index 91821609d760d..5440f008c7de2 100644
--- a/clang/test/CodeGenHLSL/builtins/clamp-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/clamp-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:  -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,NATIVE_HALF \
 // RUN:  -DTARGET=dx -DFNATTRS="hidden noundef" -DFFNATTRS="nofpclass(nan inf)"
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:  -DTARGET=dx -DFNATTRS="hidden noundef" -DFFNATTRS="nofpclass(nan inf)"
diff --git a/clang/test/CodeGenHLSL/builtins/clamp.hlsl b/clang/test/CodeGenHLSL/builtins/clamp.hlsl
index 5d7789a495e14..e3591fa32c3c2 100644
--- a/clang/test/CodeGenHLSL/builtins/clamp.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/clamp.hlsl
@@ -15,6 +15,8 @@
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:  -DTARGET=spv -DFNATTRS="hidden spir_func noundef" -DFFNATTRS="nofpclass(nan inf)"
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF: define [[FNATTRS]] i16 @_Z16test_clamp_short
 // NATIVE_HALF: call i16 @llvm.[[TARGET]].sclamp.i16(
diff --git a/clang/test/CodeGenHLSL/builtins/clip.hlsl b/clang/test/CodeGenHLSL/builtins/clip.hlsl
index 638c40e1f19f4..cf428a6d8d4dd 100644
--- a/clang/test/CodeGenHLSL/builtins/clip.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/clip.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-vulkan-library %s -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 
 void test_clip_scalar(float Buf) {
   // CHECK:      define hidden void @{{.*}}test_clip_scalar{{.*}}(float {{.*}} [[VALP:%.*]])
diff --git a/clang/test/CodeGenHLSL/builtins/cos-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/cos-overloads.hlsl
index 0b8e4039a6e5f..44ab6834f53da 100644
--- a/clang/test/CodeGenHLSL/builtins/cos-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cos-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:  -emit-llvm -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK -DFNATTRS="hidden noundef nofpclass(nan inf)"
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z15test_cos_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.cos.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/cos.hlsl b/clang/test/CodeGenHLSL/builtins/cos.hlsl
index 4d8568304c007..c260b78b2d938 100644
--- a/clang/test/CodeGenHLSL/builtins/cos.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cos.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z13test_cos_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.cos.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z13test_cos_half
diff --git a/clang/test/CodeGenHLSL/builtins/cos_mat.hlsl b/clang/test/CodeGenHLSL/builtins/cos_mat.hlsl
index c139349b617db..47fa85b0ca2f9 100644
--- a/clang/test/CodeGenHLSL/builtins/cos_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cos_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_cos_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.cos.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.cos.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/cosh-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/cosh-overloads.hlsl
index 70b5eb4d74ddc..d4cf93b465acb 100644
--- a/clang/test/CodeGenHLSL/builtins/cosh-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cosh-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_cosh_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V3:%.*]] = call {{.*}} float @llvm.cosh.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/cosh.hlsl b/clang/test/CodeGenHLSL/builtins/cosh.hlsl
index c97df2c1f0269..47a03987b80ba 100644
--- a/clang/test/CodeGenHLSL/builtins/cosh.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cosh.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_cosh_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.cosh.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.cosh.f32
diff --git a/clang/test/CodeGenHLSL/builtins/cosh_mat.hlsl b/clang/test/CodeGenHLSL/builtins/cosh_mat.hlsl
index e316d713c0651..2d83d3eceff56 100644
--- a/clang/test/CodeGenHLSL/builtins/cosh_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cosh_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_cosh_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.cosh.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.cosh.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/cross.hlsl b/clang/test/CodeGenHLSL/builtins/cross.hlsl
index db7db1ad54afb..c4723a00ea589 100644
--- a/clang/test/CodeGenHLSL/builtins/cross.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/cross.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s -DSPIR_FUNC="spir_func "
 
+using namespace hlsl;
+
 // CHECK: define hidden [[SPIR_FUNC]]noundef nofpclass(nan inf) <3 x half> @_Z16test_cross_half3Dv3_DhS_(
 // CHECK-SAME: <3 x half> noundef nofpclass(nan inf) [[P0:%.*]], <3 x half> noundef nofpclass(nan inf) [[P1:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/ddx-coarse.hlsl b/clang/test/CodeGenHLSL/builtins/ddx-coarse.hlsl
index 1aafacf5fcb49..4c4c5bcf0ee74 100644
--- a/clang/test/CodeGenHLSL/builtins/ddx-coarse.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddx-coarse.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DTGT=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: half @_Z19test_f16_ddx_coarseDh
 // CHECK: %hlsl.ddx.coarse = call {{.*}} half @llvm.[[TGT]].ddx.coarse.f16(half %{{.*}})
 // CHECK: ret half %hlsl.ddx.coarse
diff --git a/clang/test/CodeGenHLSL/builtins/ddx-fine.hlsl b/clang/test/CodeGenHLSL/builtins/ddx-fine.hlsl
index d75d850b87e8e..0138f1f13d9e6 100644
--- a/clang/test/CodeGenHLSL/builtins/ddx-fine.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddx-fine.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DTGT=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: half @_Z17test_f16_ddx_fineDh
 // CHECK: %hlsl.ddx.fine = call {{.*}} half @llvm.[[TGT]].ddx.fine.f16(half %{{.*}})
 // CHECK: ret half %hlsl.ddx.fine
diff --git a/clang/test/CodeGenHLSL/builtins/ddx.hlsl b/clang/test/CodeGenHLSL/builtins/ddx.hlsl
index 7ec896ee27851..1f1d52d85fbf5 100644
--- a/clang/test/CodeGenHLSL/builtins/ddx.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddx.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DCALL=spv.ddx -DVAR=spv.ddx
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} half @_ZN4hlsl8__detail8ddx_implIDhEET_S2_
 // CHECK: %[[VAR]] = call {{.*}} half @llvm.[[CALL]].f16(half %{{.*}})
 // CHECK: ret half %[[VAR]]
diff --git a/clang/test/CodeGenHLSL/builtins/ddy-coarse.hlsl b/clang/test/CodeGenHLSL/builtins/ddy-coarse.hlsl
index 747b08d75206a..e379a48b940f3 100644
--- a/clang/test/CodeGenHLSL/builtins/ddy-coarse.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddy-coarse.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DTGT=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: half @_Z19test_f16_ddy_coarseDh
 // CHECK: %hlsl.ddy.coarse = call {{.*}} half @llvm.[[TGT]].ddy.coarse.f16(half %{{.*}})
 // CHECK: ret half %hlsl.ddy.coarse
diff --git a/clang/test/CodeGenHLSL/builtins/ddy-fine.hlsl b/clang/test/CodeGenHLSL/builtins/ddy-fine.hlsl
index 5d98a4e0fead0..4d63a12aaea38 100644
--- a/clang/test/CodeGenHLSL/builtins/ddy-fine.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddy-fine.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DTGT=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: half @_Z17test_f16_ddy_fineDh
 // CHECK: %hlsl.ddy.fine = call {{.*}} half @llvm.[[TGT]].ddy.fine.f16(half %{{.*}})
 // CHECK: ret half %hlsl.ddy.fine
diff --git a/clang/test/CodeGenHLSL/builtins/ddy.hlsl b/clang/test/CodeGenHLSL/builtins/ddy.hlsl
index d330d589e918b..78e5774d89ac5 100644
--- a/clang/test/CodeGenHLSL/builtins/ddy.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ddy.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s -DCALL=spv.ddy -DVAR=spv.ddy
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} half @_ZN4hlsl8__detail8ddy_implIDhEET_S2_
 // CHECK: %[[VAR]] = call {{.*}} half @llvm.[[CALL]].f16(half %{{.*}})
 // CHECK: ret half %[[VAR]]
diff --git a/clang/test/CodeGenHLSL/builtins/degrees-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/degrees-overloads.hlsl
index c514128c790be..dbd5d54f3b1f5 100644
--- a/clang/test/CodeGenHLSL/builtins/degrees-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/degrees-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // Note: the f0x42652EE1 constants below equal 180/Pi.
 
 // CHECK-LABEL: test_degrees_double
diff --git a/clang/test/CodeGenHLSL/builtins/degrees.hlsl b/clang/test/CodeGenHLSL/builtins/degrees.hlsl
index a2652b260b4fe..eec3625d2fedc 100644
--- a/clang/test/CodeGenHLSL/builtins/degrees.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/degrees.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // Note: the 5.728130e+01 and f0x42652EE1 constants below equal 180/Pi.
 
 // CHECK-LABEL: test_degrees_half
diff --git a/clang/test/CodeGenHLSL/builtins/degrees_mat.hlsl b/clang/test/CodeGenHLSL/builtins/degrees_mat.hlsl
index f9423237a8c22..64414c2c38701 100644
--- a/clang/test/CodeGenHLSL/builtins/degrees_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/degrees_mat.hlsl
@@ -3,6 +3,8 @@
 // RUN:   -fnative-half-type -fnative-int16-type -emit-llvm -o - \
 // RUN:   | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_degrees_half1x2
 // CHECK: fmul reassoc nnan ninf nsz arcp afn <2 x half> {{.*}}, splat (half 5.728130e+01)
 // CHECK: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/distance.hlsl b/clang/test/CodeGenHLSL/builtins/distance.hlsl
index ce87d35d01a5b..c4d84e7dc1fd5 100644
--- a/clang/test/CodeGenHLSL/builtins/distance.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/distance.hlsl
@@ -6,6 +6,8 @@
 // RUN: spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN: -emit-llvm -O1 -o - | FileCheck %s --check-prefix=SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) half @_Z18test_distance_halfDhDh(
 // CHECK-SAME: half noundef nofpclass(nan inf) [[X:%.*]], half noundef nofpclass(nan inf) [[Y:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/dot.hlsl b/clang/test/CodeGenHLSL/builtins/dot.hlsl
index 761a57aa217a4..1a726ff34abc4 100644
--- a/clang/test/CodeGenHLSL/builtins/dot.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/dot.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/dot2add.hlsl b/clang/test/CodeGenHLSL/builtins/dot2add.hlsl
index a496ffe659da3..99c0081665073 100644
--- a/clang/test/CodeGenHLSL/builtins/dot2add.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/dot2add.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-pc-vulkan-library %s -emit-llvm -o - | \
 // RUN:   FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call.
 
 // CHECK-LABEL: define {{.*}}test_default_parameter_type
diff --git a/clang/test/CodeGenHLSL/builtins/dot4add_i8packed.hlsl b/clang/test/CodeGenHLSL/builtins/dot4add_i8packed.hlsl
index 4a41f001b6618..16463315aed2f 100644
--- a/clang/test/CodeGenHLSL/builtins/dot4add_i8packed.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/dot4add_i8packed.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.4-compute %s -emit-llvm -o - | FileCheck %s -DTARGET=dx
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan-compute %s -emit-llvm -o - | FileCheck %s -DTARGET=spv
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call.
 
 // CHECK-LABEL: test
diff --git a/clang/test/CodeGenHLSL/builtins/dot4add_u8packed.hlsl b/clang/test/CodeGenHLSL/builtins/dot4add_u8packed.hlsl
index e814da518d6bf..fad195a93990f 100644
--- a/clang/test/CodeGenHLSL/builtins/dot4add_u8packed.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/dot4add_u8packed.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.4-compute %s -emit-llvm -o - | FileCheck %s -DTARGET=dx
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan-compute %s -emit-llvm -o - | FileCheck %s -DTARGET=spv
 
+using namespace hlsl;
+
 // Test basic lowering to runtime function call.
 
 // CHECK-LABEL: test
diff --git a/clang/test/CodeGenHLSL/builtins/dst.hlsl b/clang/test/CodeGenHLSL/builtins/dst.hlsl
index 911da2775a6e3..4dc6652378576 100644
--- a/clang/test/CodeGenHLSL/builtins/dst.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/dst.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.2-library %s -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 
 // CHECK-LABEL: define {{.*}} <4 x float> @{{[A-Za-z1-9_]+}}dstWithFloat{{[A-Za-z1-9_]*}}(
 // CHECK-SAME: <4 x float> {{[A-Za-z )(]*}} [[P:%.*]], <4 x float> {{[A-Za-z )(]*}} [[Q:%.*]]) #[[ATTR0:[0-9]+]] {
diff --git a/clang/test/CodeGenHLSL/builtins/exp-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/exp-overloads.hlsl
index 2dd4eea8257cd..e71e1bc3bcaef 100644
--- a/clang/test/CodeGenHLSL/builtins/exp-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z15test_exp_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.exp.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/exp.hlsl b/clang/test/CodeGenHLSL/builtins/exp.hlsl
index 73942d0e39b96..2fb6336be83d4 100644
--- a/clang/test/CodeGenHLSL/builtins/exp.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z13test_exp_half
 // NATIVE_HALF: [[EXP:%.*]] = call reassoc nnan ninf nsz arcp afn half @llvm.exp.f16(
 // NATIVE_HALF: ret half [[EXP]]
diff --git a/clang/test/CodeGenHLSL/builtins/exp2-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/exp2-overloads.hlsl
index 2a5a41dc8e111..d78c209aa694a 100644
--- a/clang/test/CodeGenHLSL/builtins/exp2-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp2-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_exp2_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.exp2.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/exp2.hlsl b/clang/test/CodeGenHLSL/builtins/exp2.hlsl
index 81746ecff13ee..e8e123d7250a9 100644
--- a/clang/test/CodeGenHLSL/builtins/exp2.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp2.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z14test_exp2_half
 // NATIVE_HALF: [[EXP2:%.*]] = call reassoc nnan ninf nsz arcp afn half @llvm.exp2.f16(
 // NATIVE_HALF: ret half [[EXP2]]
diff --git a/clang/test/CodeGenHLSL/builtins/exp2_mat.hlsl b/clang/test/CodeGenHLSL/builtins/exp2_mat.hlsl
index 81c3771e5df24..f9e4e88a526cc 100644
--- a/clang/test/CodeGenHLSL/builtins/exp2_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp2_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_exp2_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.exp2.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.exp2.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/exp_mat.hlsl b/clang/test/CodeGenHLSL/builtins/exp_mat.hlsl
index ca75e7a1f81e0..821b9eb94dd4c 100644
--- a/clang/test/CodeGenHLSL/builtins/exp_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/exp_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_exp_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.exp.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.exp.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/f16tof32-builtin.hlsl b/clang/test/CodeGenHLSL/builtins/f16tof32-builtin.hlsl
index 7fb7026797cde..79413c8920978 100644
--- a/clang/test/CodeGenHLSL/builtins/f16tof32-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/f16tof32-builtin.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -triple spirv-unknown-vulkan-library %s -emit-llvm -O0 -o - | \
 // RUN:   FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 // CHECK: define hidden noundef nofpclass(nan inf) float
 // CHECK: %hlsl.f16tof32 = call reassoc nnan ninf nsz arcp afn float @llvm.dx.legacyf16tof32.i32(i32 %[[#]])
 // CHECK: ret float %hlsl.f16tof32
diff --git a/clang/test/CodeGenHLSL/builtins/f16tof32.hlsl b/clang/test/CodeGenHLSL/builtins/f16tof32.hlsl
index d2504b3628ee2..afd24175ba9be 100644
--- a/clang/test/CodeGenHLSL/builtins/f16tof32.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/f16tof32.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -triple spirv-unknown-vulkan-library %s -emit-llvm -O0 -o - | \
 // RUN:   FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 // CHECK: define hidden noundef nofpclass(nan inf) float
 // CHECK: %hlsl.f16tof32 = call reassoc nnan ninf nsz arcp afn float @llvm.dx.legacyf16tof32.i32(i32 %[[#]])
 // CHECK: ret float %hlsl.f16tof32
diff --git a/clang/test/CodeGenHLSL/builtins/f32tof16-builtin.hlsl b/clang/test/CodeGenHLSL/builtins/f32tof16-builtin.hlsl
index af7b66fb6bc4e..543da835f8366 100644
--- a/clang/test/CodeGenHLSL/builtins/f32tof16-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/f32tof16-builtin.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -triple spirv-unknown-vulkan-library %s -emit-llvm -O0 -o - | \
 // RUN:   FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 // CHECK: define hidden noundef i32 @_Z11test_scalarf(float noundef nofpclass(nan inf) %p0) #0 {
 // CHECK: %hlsl.f32tof16 = call i32 @llvm.dx.legacyf32tof16.f32(float %[[#]])
 // CHECK: ret i32 %hlsl.f32tof16
diff --git a/clang/test/CodeGenHLSL/builtins/f32tof16.hlsl b/clang/test/CodeGenHLSL/builtins/f32tof16.hlsl
index 65a0d7a8a5daf..2d07248fffae6 100644
--- a/clang/test/CodeGenHLSL/builtins/f32tof16.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/f32tof16.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -triple spirv-unknown-vulkan-library %s -emit-llvm -O0 -o - | \
 // RUN:   FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 // CHECK: define hidden noundef i32 @_Z11test_scalarf(float noundef nofpclass(nan inf) %p0) #0 {
 // CHECK: %hlsl.f32tof16 = call i32 @llvm.dx.legacyf32tof16.f32(float %[[#]])
 // CHECK: ret i32 %hlsl.f32tof16
diff --git a/clang/test/CodeGenHLSL/builtins/faceforward.hlsl b/clang/test/CodeGenHLSL/builtins/faceforward.hlsl
index f9a1bde781aa4..f1040c94e20b2 100644
--- a/clang/test/CodeGenHLSL/builtins/faceforward.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/faceforward.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_faceforward_half
 // CHECK: %hlsl.dot.i = fmul reassoc nnan ninf nsz arcp afn half %{{.*}}, %{{.*}}
 // CHECK: %cmp.i = fcmp reassoc nnan ninf nsz arcp afn olt half %hlsl.dot.i, 0.000000e+00
diff --git a/clang/test/CodeGenHLSL/builtins/firstbithigh.hlsl b/clang/test/CodeGenHLSL/builtins/firstbithigh.hlsl
index 0737dd8f7b1dc..5a75f1949545d 100644
--- a/clang/test/CodeGenHLSL/builtins/firstbithigh.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/firstbithigh.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type \
 // RUN:   -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s -DTARGET=spv
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // CHECK-LABEL: test_firstbithigh_ushort
 // CHECK: [[FBH:%.*]] = tail call {{.*}}i32 @llvm.[[TARGET]].firstbituhigh.i16
diff --git a/clang/test/CodeGenHLSL/builtins/firstbitlow.hlsl b/clang/test/CodeGenHLSL/builtins/firstbitlow.hlsl
index a46ef513c20b7..65e0e10a75e4f 100644
--- a/clang/test/CodeGenHLSL/builtins/firstbitlow.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/firstbitlow.hlsl
@@ -6,6 +6,8 @@
 // RUN: -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s -DTARGET=spv
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // CHECK-LABEL: test_firstbitlow_ushort
 // CHECK: call i32 @llvm.[[TARGET]].firstbitlow.i16
diff --git a/clang/test/CodeGenHLSL/builtins/floor-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/floor-overloads.hlsl
index 865a8c4d8e590..7e61ec458e911 100644
--- a/clang/test/CodeGenHLSL/builtins/floor-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/floor-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 
 using hlsl::floor;
 
diff --git a/clang/test/CodeGenHLSL/builtins/floor.hlsl b/clang/test/CodeGenHLSL/builtins/floor.hlsl
index 79489459376f5..44b332457388b 100644
--- a/clang/test/CodeGenHLSL/builtins/floor.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/floor.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 using hlsl::floor;
 
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z15test_floor_half
diff --git a/clang/test/CodeGenHLSL/builtins/floor_mat.hlsl b/clang/test/CodeGenHLSL/builtins/floor_mat.hlsl
index 552993531bf8f..f8c55ef01f08d 100644
--- a/clang/test/CodeGenHLSL/builtins/floor_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/floor_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_floor_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.floor.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.floor.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/fma.hlsl b/clang/test/CodeGenHLSL/builtins/fma.hlsl
index 9fb73c0ef0faf..e4cf66c99c15c 100644
--- a/clang/test/CodeGenHLSL/builtins/fma.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/fma.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm \
 // RUN:   -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} double @{{.*}}fma_double{{.*}}(
 // CHECK: call reassoc nnan ninf nsz arcp afn double @llvm.fma.f64(double
 // CHECK: ret double
diff --git a/clang/test/CodeGenHLSL/builtins/fmod.hlsl b/clang/test/CodeGenHLSL/builtins/fmod.hlsl
index 18eb407ff8aa7..026012438a609 100644
--- a/clang/test/CodeGenHLSL/builtins/fmod.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/fmod.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK
 
+using namespace hlsl;
+
 //
 // ---------- No Native Half support test -----------
 //
diff --git a/clang/test/CodeGenHLSL/builtins/frac-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/frac-overloads.hlsl
index e9a90fabdc25a..a35428f6dc2e3 100644
--- a/clang/test/CodeGenHLSL/builtins/frac-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/frac-overloads.hlsl
@@ -11,6 +11,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_frac_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[HLSLFRACI:%.*]] = call {{.*}} float @llvm.[[TARGET]].frac.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/frac.hlsl b/clang/test/CodeGenHLSL/builtins/frac.hlsl
index 66b9279928679..b4774b0b9e204 100644
--- a/clang/test/CodeGenHLSL/builtins/frac.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/frac.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DFNATTRS="hidden spir_func noundef nofpclass(nan inf)" -DTARGET=spv
 
+using namespace hlsl;
+
 // NATIVE_HALF: define [[FNATTRS]] half @
 // NATIVE_HALF: %hlsl.frac = call reassoc nnan ninf nsz arcp afn half @llvm.[[TARGET]].frac.f16(
 // NATIVE_HALF: ret half %hlsl.frac
diff --git a/clang/test/CodeGenHLSL/builtins/frac_mat.hlsl b/clang/test/CodeGenHLSL/builtins/frac_mat.hlsl
index c0e41a4f15315..58fbe07ce4435 100644
--- a/clang/test/CodeGenHLSL/builtins/frac_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/frac_mat.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DTARGET=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_frac_half1x2
 // NATIVE_HALF: %hlsl.frac = call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.[[TARGET]].frac.v2f16
 // NATIVE_HALF: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/fwidth.hlsl b/clang/test/CodeGenHLSL/builtins/fwidth.hlsl
index 2935fbbc4f6a2..6d9c94e1cef84 100644
--- a/clang/test/CodeGenHLSL/builtins/fwidth.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/fwidth.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -fnative-half-type -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} half @_ZN4hlsl8__detail11fwidth_implIDhEET_S2_
 // CHECK: %hlsl.ddx.coarse = call {{.*}} half @llvm.dx.ddx.coarse.f16(half %{{.*}})
 // CHECK: %{{.*}} = call {{.*}} half @llvm.fabs.f16(half %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/hlsl_resource_t.hlsl b/clang/test/CodeGenHLSL/builtins/hlsl_resource_t.hlsl
index d333c01aa201c..a3d550cb9fd34 100644
--- a/clang/test/CodeGenHLSL/builtins/hlsl_resource_t.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/hlsl_resource_t.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -emit-llvm -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 using handle_float_t = __hlsl_resource_t [[hlsl::resource_class("UAV")]] [[hlsl::contained_type(float)]];
 
 struct CustomResource {
diff --git a/clang/test/CodeGenHLSL/builtins/isfinite-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isfinite-overloads.hlsl
index d84c94d8c739c..ce650726123dc 100644
--- a/clang/test/CodeGenHLSL/builtins/isfinite-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isfinite-overloads.hlsl
@@ -11,6 +11,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] i1 @_Z20test_isfinite_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[HLSLISFINITEI:%.*]] = call noundef i1 @llvm.[[TARGET]].isfinite.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/isfinite.hlsl b/clang/test/CodeGenHLSL/builtins/isfinite.hlsl
index aa6158167926a..2f23be9b8f992 100644
--- a/clang/test/CodeGenHLSL/builtins/isfinite.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isfinite.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/isfinite_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isfinite_mat-overloads.hlsl
index 299facd20a277..37f368ed95d9a 100644
--- a/clang/test/CodeGenHLSL/builtins/isfinite_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isfinite_mat-overloads.hlsl
@@ -9,6 +9,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} <2 x i1> @_{{.*}}test_isfinite_double1x2{{.*}}(
 // CHECK:    [[CONV:%.*]] = fptrunc {{.*}} <2 x double> %{{.*}} to <2 x float>
 // CHECK:    [[RET:%.*]] = call <2 x i1> @llvm.[[TARGET]].isfinite.v2f32(<2 x float> [[CONV]])
diff --git a/clang/test/CodeGenHLSL/builtins/isfinite_mat.hlsl b/clang/test/CodeGenHLSL/builtins/isfinite_mat.hlsl
index 886f4ef2d071d..895cffb6f79b9 100644
--- a/clang/test/CodeGenHLSL/builtins/isfinite_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isfinite_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/isinf-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isinf-overloads.hlsl
index 229eced2c479a..ddd4666e10521 100644
--- a/clang/test/CodeGenHLSL/builtins/isinf-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isinf-overloads.hlsl
@@ -11,6 +11,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] i1 @_Z17test_isinf_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[HLSLISINFI:%.*]] = call noundef i1 @llvm.[[TARGET]].isinf.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/isinf.hlsl b/clang/test/CodeGenHLSL/builtins/isinf.hlsl
index 37a6f000d6b8f..0e350bf5344da 100644
--- a/clang/test/CodeGenHLSL/builtins/isinf.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isinf.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/isinf_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isinf_mat-overloads.hlsl
index 562ac62b7e17f..3b86e3055c325 100644
--- a/clang/test/CodeGenHLSL/builtins/isinf_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isinf_mat-overloads.hlsl
@@ -9,6 +9,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} <2 x i1> @_{{.*}}test_isinf_double1x2{{.*}}(
 // CHECK:    [[CONV:%.*]] = fptrunc {{.*}} <2 x double> %{{.*}} to <2 x float>
 // CHECK:    [[RET:%.*]] = call <2 x i1> @llvm.[[TARGET]].isinf.v2f32(<2 x float> [[CONV]])
diff --git a/clang/test/CodeGenHLSL/builtins/isinf_mat.hlsl b/clang/test/CodeGenHLSL/builtins/isinf_mat.hlsl
index ffa15516967d5..83590b11e4536 100644
--- a/clang/test/CodeGenHLSL/builtins/isinf_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isinf_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/isnan-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isnan-overloads.hlsl
index a0c3eee5da636..be3c76e411747 100644
--- a/clang/test/CodeGenHLSL/builtins/isnan-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isnan-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: define hidden noundef i1 @
 // CHECK: %hlsl.isnan = call i1 @llvm.dx.isnan.f32(
 // CHECK: ret i1 %hlsl.isnan
diff --git a/clang/test/CodeGenHLSL/builtins/isnan.hlsl b/clang/test/CodeGenHLSL/builtins/isnan.hlsl
index 6e5922db52e64..973e824cc1eaf 100644
--- a/clang/test/CodeGenHLSL/builtins/isnan.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isnan.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/isnan_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/isnan_mat-overloads.hlsl
index 7e02231a4baa9..b8503cce704af 100644
--- a/clang/test/CodeGenHLSL/builtins/isnan_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isnan_mat-overloads.hlsl
@@ -9,6 +9,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}} <2 x i1> @_{{.*}}test_isnan_double1x2{{.*}}(
 // CHECK:    [[CONV:%.*]] = fptrunc {{.*}} <2 x double> %{{.*}} to <2 x float>
 // CHECK:    [[RET:%.*]] = call <2 x i1> @llvm.[[TARGET]].isnan.v2f32(<2 x float> [[CONV]])
diff --git a/clang/test/CodeGenHLSL/builtins/isnan_mat.hlsl b/clang/test/CodeGenHLSL/builtins/isnan_mat.hlsl
index a6f31f5e17acf..4fec1c5d9a4e2 100644
--- a/clang/test/CodeGenHLSL/builtins/isnan_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/isnan_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXCHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/ldexp.hlsl b/clang/test/CodeGenHLSL/builtins/ldexp.hlsl
index 170c635e99b61..cdc8f9bd28fac 100644
--- a/clang/test/CodeGenHLSL/builtins/ldexp.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/ldexp.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define linkonce_odr hidden noundef nofpclass(nan inf) half @_ZN4hlsl5ldexpEDhDh
 // CHECK: [[EXP2:%.*]] = call reassoc nnan ninf nsz arcp afn half @llvm.exp2.f16(half %{{.*}})
 // CHECK: [[MUL:%.*]] = fmul reassoc nnan ninf nsz arcp afn half [[EXP2]], %{{.*}}
diff --git a/clang/test/CodeGenHLSL/builtins/length.hlsl b/clang/test/CodeGenHLSL/builtins/length.hlsl
index 36c62f2d78818..58c2c55b1f630 100644
--- a/clang/test/CodeGenHLSL/builtins/length.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/length.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple \
 // RUN: spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN: -emit-llvm -O1 -o - | FileCheck %s --check-prefix=SPVCHECK
diff --git a/clang/test/CodeGenHLSL/builtins/lerp-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/lerp-overloads.hlsl
index 2e915141fac9a..df05e7aba9a99 100644
--- a/clang/test/CodeGenHLSL/builtins/lerp-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/lerp-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_lerp_double
 // CHECK:    [[CONV0:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[CONV1:%.*]] = fptrunc {{.*}} double %{{.*}} to float
diff --git a/clang/test/CodeGenHLSL/builtins/lerp.hlsl b/clang/test/CodeGenHLSL/builtins/lerp.hlsl
index fe685430f060c..cf17defa89b6f 100644
--- a/clang/test/CodeGenHLSL/builtins/lerp.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/lerp.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_lerp_half
 // CHECK: [[SUB:%.*]] = fsub reassoc nnan ninf nsz arcp afn half %{{.*}}, %{{.*}}
 // CHECK-NEXT: [[MUL:%.*]] = fmul reassoc nnan ninf nsz arcp afn half %{{.*}}, [[SUB]]
diff --git a/clang/test/CodeGenHLSL/builtins/lit.hlsl b/clang/test/CodeGenHLSL/builtins/lit.hlsl
index 541b332bf5cad..36d74c887cda6 100644
--- a/clang/test/CodeGenHLSL/builtins/lit.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/lit.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_lit_half
 // CHECK: %cmp.i = fcmp reassoc nnan ninf nsz arcp afn olt half %{{.*}}, 0.000000e+00
 // CHECK: %hlsl.select.i = select reassoc nnan ninf nsz arcp afn i1 %{{.*}}, half 0.000000e+00, half %{{.*}}
diff --git a/clang/test/CodeGenHLSL/builtins/log-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/log-overloads.hlsl
index 17e7183153c19..b30acff491fef 100644
--- a/clang/test/CodeGenHLSL/builtins/log-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z15test_log_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.log.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/log.hlsl b/clang/test/CodeGenHLSL/builtins/log.hlsl
index 476b41a6a00f6..70b4ad85ea100 100644
--- a/clang/test/CodeGenHLSL/builtins/log.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z13test_log_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.log.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z13test_log_half
diff --git a/clang/test/CodeGenHLSL/builtins/log10-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/log10-overloads.hlsl
index 556cc48babfee..d1be311ff0672 100644
--- a/clang/test/CodeGenHLSL/builtins/log10-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log10-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z17test_log10_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.log10.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/log10.hlsl b/clang/test/CodeGenHLSL/builtins/log10.hlsl
index 26869d7ad6425..0d98a9240d998 100644
--- a/clang/test/CodeGenHLSL/builtins/log10.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log10.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z15test_log10_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.log10.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z15test_log10_half
diff --git a/clang/test/CodeGenHLSL/builtins/log10_mat.hlsl b/clang/test/CodeGenHLSL/builtins/log10_mat.hlsl
index a76e3969d3490..4d8bb1c0a5325 100644
--- a/clang/test/CodeGenHLSL/builtins/log10_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log10_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_log10_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.log10.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.log10.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/log2-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/log2-overloads.hlsl
index 583f99d61386b..7526ace8967a9 100644
--- a/clang/test/CodeGenHLSL/builtins/log2-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log2-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_log2_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.log2.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/log2.hlsl b/clang/test/CodeGenHLSL/builtins/log2.hlsl
index cf5ad5211331e..277537e7f75f0 100644
--- a/clang/test/CodeGenHLSL/builtins/log2.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log2.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z14test_log2_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.log2.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z14test_log2_half
diff --git a/clang/test/CodeGenHLSL/builtins/log2_mat.hlsl b/clang/test/CodeGenHLSL/builtins/log2_mat.hlsl
index 0fea41d90a673..2ac1c695b42f1 100644
--- a/clang/test/CodeGenHLSL/builtins/log2_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log2_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_log2_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.log2.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.log2.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/log_mat.hlsl b/clang/test/CodeGenHLSL/builtins/log_mat.hlsl
index 3e2eaa5b4cf45..66db939d38af2 100644
--- a/clang/test/CodeGenHLSL/builtins/log_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/log_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_log_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.log.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.log.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/mad.hlsl b/clang/test/CodeGenHLSL/builtins/mad.hlsl
index e45fb0bc20383..593aff791aacb 100644
--- a/clang/test/CodeGenHLSL/builtins/mad.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/mad.hlsl
@@ -6,6 +6,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,DXIL_CHECK,NO_HALF
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
diff --git a/clang/test/CodeGenHLSL/builtins/max-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/max-overloads.hlsl
index 0f437eecd0af0..fbd04a42f9934 100644
--- a/clang/test/CodeGenHLSL/builtins/max-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/max-overloads.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: define hidden noundef <4 x i16> {{.*}}test_max_short4_mismatch
 // NATIVE_HALF: [[CONV0:%.*]] = insertelement <4 x i16> poison, i16 %{{.*}}, i64 0
diff --git a/clang/test/CodeGenHLSL/builtins/max.hlsl b/clang/test/CodeGenHLSL/builtins/max.hlsl
index 48168626c0aae..7118cba97eed9 100644
--- a/clang/test/CodeGenHLSL/builtins/max.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/max.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: define hidden noundef i16 @_Z14test_max_short
 // NATIVE_HALF: call i16 @llvm.smax.i16(
diff --git a/clang/test/CodeGenHLSL/builtins/max_mat.hlsl b/clang/test/CodeGenHLSL/builtins/max_mat.hlsl
index 29d7c96ef3964..bed835ae40ce3 100644
--- a/clang/test/CodeGenHLSL/builtins/max_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/max_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: test_max_short1x2
 // NATIVE_HALF: call <2 x i16> @llvm.smax.v2i16(<2 x i16> %{{.*}}, <2 x i16> %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/min-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/min-overloads.hlsl
index be8b45d8b8dfb..2614b5cd48305 100644
--- a/clang/test/CodeGenHLSL/builtins/min-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/min-overloads.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: define hidden noundef <4 x i16> {{.*}}test_min_short4_mismatch
 // NATIVE_HALF: [[CONV0:%.*]] = insertelement <4 x i16> poison, i16 %{{.*}}, i64 0
diff --git a/clang/test/CodeGenHLSL/builtins/min.hlsl b/clang/test/CodeGenHLSL/builtins/min.hlsl
index 4c72e140e9151..7ade5ad2baa8e 100644
--- a/clang/test/CodeGenHLSL/builtins/min.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/min.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: define hidden noundef i16 @_Z14test_min_short
 // NATIVE_HALF: call i16 @llvm.smin.i16(
diff --git a/clang/test/CodeGenHLSL/builtins/min_mat.hlsl b/clang/test/CodeGenHLSL/builtins/min_mat.hlsl
index 268fdc9cce3fd..20d8ed23397c8 100644
--- a/clang/test/CodeGenHLSL/builtins/min_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/min_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 #ifdef __HLSL_ENABLE_16_BIT
 // NATIVE_HALF-LABEL: test_min_short1x2
 // NATIVE_HALF: call <2 x i16> @llvm.smin.v2i16(<2 x i16> %{{.*}}, <2 x i16> %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/mul.hlsl b/clang/test/CodeGenHLSL/builtins/mul.hlsl
index 3af97f7ca31fc..a90c6d0e0a2da 100644
--- a/clang/test/CodeGenHLSL/builtins/mul.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/mul.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -O1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -emit-llvm -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROWMAJOR,DXIL
 // RUN: %clang_cc1 -finclude-default-header -O1 -triple spirv-unknown-vulkan1.3-library -fnative-half-type -emit-llvm -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROWMAJOR,SPIRV
 
+using namespace hlsl;
+
 // -- Case 1: scalar * scalar -> scalar --
 
 // CHECK-LABEL: test_scalar_mulf
diff --git a/clang/test/CodeGenHLSL/builtins/normalize-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/normalize-overloads.hlsl
index 6c8d32c681b2b..9455fbb35e46a 100644
--- a/clang/test/CodeGenHLSL/builtins/normalize-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/normalize-overloads.hlsl
@@ -9,6 +9,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_normalize_double
 // CHECK: [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK: [[ABS:%.*]] = call {{.*}} float @llvm.fabs.f32(float %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/normalize.hlsl b/clang/test/CodeGenHLSL/builtins/normalize.hlsl
index 7eb8c9a30c5c3..28d04dc6ecef5 100644
--- a/clang/test/CodeGenHLSL/builtins/normalize.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/normalize.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK,SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_normalize_half
 // CHECK: [[ABS:%.*]] = call reassoc nnan ninf nsz arcp afn noundef nofpclass(nan inf) half @llvm.fabs.f16(half %{{.*}})
 // CHECK-NEXT: [[RET:%.*]] = fdiv reassoc nnan ninf nsz arcp afn half %{{.*}}, [[ABS]]
diff --git a/clang/test/CodeGenHLSL/builtins/or.hlsl b/clang/test/CodeGenHLSL/builtins/or.hlsl
index 429d68c21d04a..3acbf5834f491 100644
--- a/clang/test/CodeGenHLSL/builtins/or.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/or.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef i1 @_Z14test_or_scalarbb(
 // CHECK-SAME: i1 noundef [[X:%.*]], i1 noundef [[Y:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  entry:
diff --git a/clang/test/CodeGenHLSL/builtins/or_mat.hlsl b/clang/test/CodeGenHLSL/builtins/or_mat.hlsl
index 2898ff8c7c913..ef3693f1f339f 100644
--- a/clang/test/CodeGenHLSL/builtins/or_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/or_mat.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef <2 x i1> @_Z15test_or_bool1x2u11matrix_typeILm1ELm2EbES_(
 // CHECK-SAME: <2 x i1> noundef [[X:%.*]], <2 x i1> noundef [[Y:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  entry:
diff --git a/clang/test/CodeGenHLSL/builtins/pow-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/pow-overloads.hlsl
index 257da93174e4a..01d29fa8950b3 100644
--- a/clang/test/CodeGenHLSL/builtins/pow-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/pow-overloads.hlsl
@@ -2,6 +2,8 @@
 // RUN:  -emit-llvm -o - | FileCheck %s --check-prefixes=CHECK \
 // RUN:  -DFLOATATTRS="reassoc nnan ninf nsz arcp afn"
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) float {{.*}}test_pow_double
 // CHECK: [[CONV0:%.*]] = fptrunc [[FLOATATTRS]] double %{{.*}} to float
 // CHECK: [[CONV1:%.*]] = fptrunc [[FLOATATTRS]] double %{{.*}} to float
diff --git a/clang/test/CodeGenHLSL/builtins/pow.hlsl b/clang/test/CodeGenHLSL/builtins/pow.hlsl
index 4d4717ccd69ec..e9118027203da 100644
--- a/clang/test/CodeGenHLSL/builtins/pow.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/pow.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z13test_pow_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.pow.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z13test_pow_half
diff --git a/clang/test/CodeGenHLSL/builtins/pow_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/pow_mat-overloads.hlsl
index 74799dc03a418..4961098f44a66 100644
--- a/clang/test/CodeGenHLSL/builtins/pow_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/pow_mat-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm  \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK -DSPIR_FUNC="spir_func "
 
+using namespace hlsl;
+
 
 // CHECK: define hidden [[SPIR_FUNC]]noundef nofpclass(nan inf) <12 x float> @_{{.*}}test_pow_double3x4{{.*}}(
 // CHECK:    [[CONVI:%.*]] = fptrunc [[FMF:reassoc nnan ninf nsz arcp afn]] <12 x double> %{{.*}} to <12 x float>
diff --git a/clang/test/CodeGenHLSL/builtins/pow_mat.hlsl b/clang/test/CodeGenHLSL/builtins/pow_mat.hlsl
index 7beaaec2dc447..6b8697d91553c 100644
--- a/clang/test/CodeGenHLSL/builtins/pow_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/pow_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_pow_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.pow.v2f16(<2 x half> %{{.*}}, <2 x half> %{{.*}})
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.pow.v2f32(<2 x float> %{{.*}}, <2 x float> %{{.*}})
diff --git a/clang/test/CodeGenHLSL/builtins/radians-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/radians-overloads.hlsl
index cc614b9dffe3d..508428ee97e8e 100644
--- a/clang/test/CodeGenHLSL/builtins/radians-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/radians-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // Note: the f0x3C8EFA35 constants below equal Pi/180.
 
 // CHECK-LABEL: test_radians_double
diff --git a/clang/test/CodeGenHLSL/builtins/radians.hlsl b/clang/test/CodeGenHLSL/builtins/radians.hlsl
index 5d9447a3d5882..9a75214efb2bd 100644
--- a/clang/test/CodeGenHLSL/builtins/radians.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/radians.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // Note: the 1.745610e-02 and f0x3C8EFA35 constants below equal Pi/180.
 
 // CHECK-LABEL: test_radians_half
diff --git a/clang/test/CodeGenHLSL/builtins/radians_mat.hlsl b/clang/test/CodeGenHLSL/builtins/radians_mat.hlsl
index 231e8b5ea0258..ec19d8d1cf1a8 100644
--- a/clang/test/CodeGenHLSL/builtins/radians_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/radians_mat.hlsl
@@ -3,6 +3,8 @@
 // RUN:   -fnative-half-type -fnative-int16-type -emit-llvm -o - \
 // RUN:   | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_radians_half1x2
 // CHECK: fmul reassoc nnan ninf nsz arcp afn <2 x half> {{.*}}, splat (half 1.745610e-02)
 // CHECK: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/rcp.hlsl b/clang/test/CodeGenHLSL/builtins/rcp.hlsl
index 4807ea2486b39..20f6a8b1bfdc3 100644
--- a/clang/test/CodeGenHLSL/builtins/rcp.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/rcp.hlsl
@@ -13,6 +13,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF,SPIR_NO_HALF,SPIR_CHECK
 
+using namespace hlsl;
+
 // DXIL_NATIVE_HALF: define hidden noundef nofpclass(nan inf) half @
 // SPIR_NATIVE_HALF: define hidden spir_func noundef nofpclass(nan inf) half @
 // NATIVE_HALF: %hlsl.rcp = fdiv reassoc nnan ninf nsz arcp afn half 1.000000e+00, %{{.*}} 
diff --git a/clang/test/CodeGenHLSL/builtins/rcp_mat.hlsl b/clang/test/CodeGenHLSL/builtins/rcp_mat.hlsl
index 2ef651d095524..1836c1f1b2781 100644
--- a/clang/test/CodeGenHLSL/builtins/rcp_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/rcp_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_rcp_half1x2
 // NATIVE_HALF: %hlsl.rcp = fdiv reassoc nnan ninf nsz arcp afn <2 x half> splat (half 1.000000e+00), %{{.*}}
 // NATIVE_HALF: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/reflect.hlsl b/clang/test/CodeGenHLSL/builtins/reflect.hlsl
index 387c01bb1d331..b82cf82572faa 100644
--- a/clang/test/CodeGenHLSL/builtins/reflect.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/reflect.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s --check-prefix=SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) half @_Z17test_reflect_halfDhDh(
 // CHECK-SAME: half noundef nofpclass(nan inf) [[I:%.*]], half noundef nofpclass(nan inf) [[N:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/refract.hlsl b/clang/test/CodeGenHLSL/builtins/refract.hlsl
index 676e07a0e8d17..6bb0a2c16dc44 100644
--- a/clang/test/CodeGenHLSL/builtins/refract.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/refract.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -o - | FileCheck %s --check-prefix=SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) half @_Z17test_refract_halfDhDhDh(
 // CHECK-SAME: half noundef nofpclass(nan inf) [[I:%.*]], half noundef nofpclass(nan inf) [[N:%.*]], half noundef nofpclass(nan inf) [[ETA:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/round-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/round-overloads.hlsl
index 0744e7ebb821b..3f5b104caf4f0 100644
--- a/clang/test/CodeGenHLSL/builtins/round-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/round-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z17test_round_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.roundeven.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/round.hlsl b/clang/test/CodeGenHLSL/builtins/round.hlsl
index 0d8bd407723ac..33fc407855de8 100644
--- a/clang/test/CodeGenHLSL/builtins/round.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/round.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z15test_round_half
 // NATIVE_HALF: [[ROUNDEVEN:%.*]] = call reassoc nnan ninf nsz arcp afn half @llvm.roundeven.f16(
 // NATIVE_HALF: ret half [[ROUNDEVEN]]
diff --git a/clang/test/CodeGenHLSL/builtins/round_mat.hlsl b/clang/test/CodeGenHLSL/builtins/round_mat.hlsl
index 72ff5ca3ba78f..36cd8b2bca04c 100644
--- a/clang/test/CodeGenHLSL/builtins/round_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/round_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_round_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.roundeven.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.roundeven.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/rsqrt-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/rsqrt-overloads.hlsl
index 75e59cfda658c..ecdc207716403 100644
--- a/clang/test/CodeGenHLSL/builtins/rsqrt-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/rsqrt-overloads.hlsl
@@ -11,6 +11,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z17test_rsqrt_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[HLSLRSQRTI:%.*]] = call {{.*}} float @llvm.[[TARGET]].rsqrt.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/rsqrt.hlsl b/clang/test/CodeGenHLSL/builtins/rsqrt.hlsl
index cbd5cde60c132..4796f63e51c88 100644
--- a/clang/test/CodeGenHLSL/builtins/rsqrt.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/rsqrt.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DFNATTRS="hidden spir_func noundef nofpclass(nan inf)" -DTARGET=spv
 
+using namespace hlsl;
+
 // NATIVE_HALF: define [[FNATTRS]] half @
 // NATIVE_HALF: %hlsl.rsqrt = call reassoc nnan ninf nsz arcp afn half @llvm.[[TARGET]].rsqrt.f16(
 // NATIVE_HALF: ret half %hlsl.rsqrt
diff --git a/clang/test/CodeGenHLSL/builtins/rsqrt_mat.hlsl b/clang/test/CodeGenHLSL/builtins/rsqrt_mat.hlsl
index ccdfa6f97d7bd..7c416c955bdf4 100644
--- a/clang/test/CodeGenHLSL/builtins/rsqrt_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/rsqrt_mat.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DTARGET=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_rsqrt_half1x2
 // NATIVE_HALF: %hlsl.rsqrt = call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.[[TARGET]].rsqrt.v2f16
 // NATIVE_HALF: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/saturate.hlsl b/clang/test/CodeGenHLSL/builtins/saturate.hlsl
index 9b926be4129d8..ed3b5d3f0b703 100644
--- a/clang/test/CodeGenHLSL/builtins/saturate.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/saturate.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF -Dtar=dx
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-library %s \
 // RUN:  -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NATIVE_HALF -Dtar=spv
diff --git a/clang/test/CodeGenHLSL/builtins/saturate_mat.hlsl b/clang/test/CodeGenHLSL/builtins/saturate_mat.hlsl
index c10137930eb6b..a99fdb498ac6d 100644
--- a/clang/test/CodeGenHLSL/builtins/saturate_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/saturate_mat.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DTARGET=spv
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_saturate_half1x2
 // NATIVE_HALF: %hlsl.saturate = call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.[[TARGET]].saturate.v2f16
 // NATIVE_HALF: ret <2 x half>
diff --git a/clang/test/CodeGenHLSL/builtins/select.hlsl b/clang/test/CodeGenHLSL/builtins/select.hlsl
index fcae427882db9..63798d2107e32 100644
--- a/clang/test/CodeGenHLSL/builtins/select.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/select.hlsl
@@ -6,6 +6,8 @@
 // RUN:   -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   --check-prefixes=CHECK,NATIVE_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_select_bool_int
 // CHECK: [[SELECT:%.*]] = select i1 {{%.*}}, i32 {{%.*}}, i32 {{%.*}}
 // CHECK: ret i32 [[SELECT]]
diff --git a/clang/test/CodeGenHLSL/builtins/select_mat.hlsl b/clang/test/CodeGenHLSL/builtins/select_mat.hlsl
index f0adba2066c18..c11a645434f09 100644
--- a/clang/test/CodeGenHLSL/builtins/select_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/select_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   --check-prefixes=CHECK,NATIVE_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_select_half2x3
 // NO_HALF: select {{.*}}<6 x i1> {{%.*}}, <6 x float> {{%.*}}, <6 x float> {{%.*}}
 // NATIVE_HALF: select {{.*}}<6 x i1> {{%.*}}, <6 x half> {{%.*}}, <6 x half> {{%.*}}
diff --git a/clang/test/CodeGenHLSL/builtins/sign.hlsl b/clang/test/CodeGenHLSL/builtins/sign.hlsl
index b18e5771f567a..66f831f96cd88 100644
--- a/clang/test/CodeGenHLSL/builtins/sign.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sign.hlsl
@@ -17,6 +17,8 @@
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF \
 // RUN:   -DTARGET=spv -DFNATTRS="hidden spir_func noundef"
 
+using namespace hlsl;
+
 // NATIVE_HALF: define [[FNATTRS]] i32 @
 // NATIVE_HALF: %hlsl.sign = call i32 @llvm.[[TARGET]].sign.f16(
 // NATIVE_HALF: ret i32 %hlsl.sign
diff --git a/clang/test/CodeGenHLSL/builtins/sin-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/sin-overloads.hlsl
index 6628c35b8a9ad..ec91f8e390098 100644
--- a/clang/test/CodeGenHLSL/builtins/sin-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sin-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z15test_sin_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.sin.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/sin.hlsl b/clang/test/CodeGenHLSL/builtins/sin.hlsl
index f5a9a49017f4e..27fb211069c54 100644
--- a/clang/test/CodeGenHLSL/builtins/sin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sin.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z13test_sin_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.sin.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z13test_sin_half
diff --git a/clang/test/CodeGenHLSL/builtins/sin_mat.hlsl b/clang/test/CodeGenHLSL/builtins/sin_mat.hlsl
index c2c86f55a1a11..e93558e79e446 100644
--- a/clang/test/CodeGenHLSL/builtins/sin_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sin_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_sin_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.sin.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.sin.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/sinh-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/sinh-overloads.hlsl
index cbae4bdd7ba74..5c5a85aa0d75d 100644
--- a/clang/test/CodeGenHLSL/builtins/sinh-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sinh-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:  -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_sinh_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.sinh.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/sinh.hlsl b/clang/test/CodeGenHLSL/builtins/sinh.hlsl
index 983169b9ae730..16822a45914ee 100644
--- a/clang/test/CodeGenHLSL/builtins/sinh.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sinh.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_sinh_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.sinh.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.sinh.f32
diff --git a/clang/test/CodeGenHLSL/builtins/sinh_mat.hlsl b/clang/test/CodeGenHLSL/builtins/sinh_mat.hlsl
index 267bf530b4bcb..a9aa7fc6da0cd 100644
--- a/clang/test/CodeGenHLSL/builtins/sinh_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sinh_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_sinh_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.sinh.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.sinh.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/smoothstep.hlsl b/clang/test/CodeGenHLSL/builtins/smoothstep.hlsl
index 776cf64be4859..f1a051995a280 100644
--- a/clang/test/CodeGenHLSL/builtins/smoothstep.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/smoothstep.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s --check-prefix=SPVCHECK
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) half @_Z20test_smoothstep_halfDhDhDh(
 // CHECK-SAME: half noundef nofpclass(nan inf) [[MIN:%.*]], half noundef nofpclass(nan inf) [[MAX:%.*]], half noundef nofpclass(nan inf) [[X:%.*]]) local_unnamed_addr #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/builtins/splitdouble.hlsl b/clang/test/CodeGenHLSL/builtins/splitdouble.hlsl
index afacf59ce144e..77d0a194d06c8 100644
--- a/clang/test/CodeGenHLSL/builtins/splitdouble.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/splitdouble.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple spirv-vulkan-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O0 -o - | FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 
 
 // CHECK: define {{.*}} i32 {{.*}}test_scalar{{.*}}(double {{.*}} [[VALD:%.*]])
diff --git a/clang/test/CodeGenHLSL/builtins/splitdouble_mat.hlsl b/clang/test/CodeGenHLSL/builtins/splitdouble_mat.hlsl
index 1735c4474f22a..4d38b294ef775 100644
--- a/clang/test/CodeGenHLSL/builtins/splitdouble_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/splitdouble_mat.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O1 -o - | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple spirv-vulkan-library %s -fnative-half-type -fnative-int16-type -emit-llvm -O0 -o - | FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 
 
 // CHECK: define {{.*}} <4 x i32> {{.*}}test_mat2x2{{.*}}(<4 x double> {{.*}} [[VALD:%.*]])
diff --git a/clang/test/CodeGenHLSL/builtins/sqrt-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/sqrt-overloads.hlsl
index e09329236e5fd..916093b81cb4c 100644
--- a/clang/test/CodeGenHLSL/builtins/sqrt-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sqrt-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_sqrt_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.sqrt.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/sqrt.hlsl b/clang/test/CodeGenHLSL/builtins/sqrt.hlsl
index 7b59ba827cfff..3c34f759e0168 100644
--- a/clang/test/CodeGenHLSL/builtins/sqrt.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sqrt.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z14test_sqrt_half
 // NATIVE_HALF: %{{.*}} = call reassoc nnan ninf nsz arcp afn half @llvm.sqrt.f16(
 // NATIVE_HALF: ret half %{{.*}}
diff --git a/clang/test/CodeGenHLSL/builtins/sqrt_mat.hlsl b/clang/test/CodeGenHLSL/builtins/sqrt_mat.hlsl
index 25fc73d817de4..6dcb42f653a32 100644
--- a/clang/test/CodeGenHLSL/builtins/sqrt_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/sqrt_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_sqrt_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.sqrt.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.sqrt.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/step-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/step-overloads.hlsl
index 2480f61f0a105..4ed6a24142a7b 100644
--- a/clang/test/CodeGenHLSL/builtins/step-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/step-overloads.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_step_double
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[CONV1I:%.*]] = fptrunc {{.*}} double %{{.*}} to float
diff --git a/clang/test/CodeGenHLSL/builtins/step.hlsl b/clang/test/CodeGenHLSL/builtins/step.hlsl
index 7720da02e07bd..9dfdc4e3f5075 100644
--- a/clang/test/CodeGenHLSL/builtins/step.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/step.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_step_half
 // CHECK: [[CMP:%.*]] = fcmp reassoc nnan ninf nsz arcp afn olt half %p1, %p0
 // CHECK-NEXT: [[SELECT:%.*]] = select reassoc nnan ninf nsz arcp afn i1 [[CMP]], half 0.000000e+00, half 1.000000e+00
diff --git a/clang/test/CodeGenHLSL/builtins/step_mat-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/step_mat-overloads.hlsl
index 8841cf483192e..c36469b213531 100644
--- a/clang/test/CodeGenHLSL/builtins/step_mat-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/step_mat-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm  \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK -DSPIR_FUNC="spir_func "
 
+using namespace hlsl;
+
 
 // CHECK: define hidden [[SPIR_FUNC]]noundef nofpclass(nan inf) <12 x float> @_{{.*}}test_step_double3x4{{.*}}(
 // CHECK:    fptrunc [[FMF:reassoc nnan ninf nsz arcp afn]] <12 x double> %{{.*}} to <12 x float>
diff --git a/clang/test/CodeGenHLSL/builtins/step_mat.hlsl b/clang/test/CodeGenHLSL/builtins/step_mat.hlsl
index ecd271323e860..18e6f4d05e1bd 100644
--- a/clang/test/CodeGenHLSL/builtins/step_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/step_mat.hlsl
@@ -3,6 +3,8 @@
 // RUN:   -fnative-half-type -fnative-int16-type -emit-llvm -o - \
 // RUN:   | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_step_half2x3
 // CHECK: [[CMP:%.*]] = fcmp reassoc nnan ninf nsz arcp afn olt <6 x half> %{{.*}}, %{{.*}}
 // CHECK: select reassoc nnan ninf nsz arcp afn <6 x i1> [[CMP]], <6 x half> zeroinitializer, <6 x half> splat (half 1.000000e+00)
diff --git a/clang/test/CodeGenHLSL/builtins/tan-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/tan-overloads.hlsl
index 7969e76018572..c5afdc01d2ff7 100644
--- a/clang/test/CodeGenHLSL/builtins/tan-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tan-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z15test_tan_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V3:%.*]] = call {{.*}} float @llvm.tan.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/tan.hlsl b/clang/test/CodeGenHLSL/builtins/tan.hlsl
index c63f2c0ac4e8d..6a5b417887eba 100644
--- a/clang/test/CodeGenHLSL/builtins/tan.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tan.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_tan_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.tan.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.tan.f32
diff --git a/clang/test/CodeGenHLSL/builtins/tan_mat.hlsl b/clang/test/CodeGenHLSL/builtins/tan_mat.hlsl
index 9a7a3a6ba55fa..e887b14b351f6 100644
--- a/clang/test/CodeGenHLSL/builtins/tan_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tan_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_tan_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.tan.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.tan.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/tanh-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/tanh-overloads.hlsl
index 7f683ac29ae77..3311ea572a63b 100644
--- a/clang/test/CodeGenHLSL/builtins/tanh-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tanh-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple spirv-unknown-vulkan-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z16test_tanh_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V3:%.*]] = call {{.*}} float @llvm.tanh.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/tanh.hlsl b/clang/test/CodeGenHLSL/builtins/tanh.hlsl
index 287c217c746cf..1c968048427e7 100644
--- a/clang/test/CodeGenHLSL/builtins/tanh.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tanh.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_tanh_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.tanh.f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn float @llvm.tanh.f32
diff --git a/clang/test/CodeGenHLSL/builtins/tanh_mat.hlsl b/clang/test/CodeGenHLSL/builtins/tanh_mat.hlsl
index 7c135d5037b77..a53fb9c14ef40 100644
--- a/clang/test/CodeGenHLSL/builtins/tanh_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/tanh_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_tanh_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.tanh.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.tanh.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/transpose-builtin.hlsl b/clang/test/CodeGenHLSL/builtins/transpose-builtin.hlsl
index ef282fc355b23..b80370dbc4b02 100644
--- a/clang/test/CodeGenHLSL/builtins/transpose-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/transpose-builtin.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // NOTE: This test is only to confirm we can do codgen with the matrix alias.
 
 // CHECK-LABEL: define {{.*}}transpose_half_2x2
diff --git a/clang/test/CodeGenHLSL/builtins/transpose.hlsl b/clang/test/CodeGenHLSL/builtins/transpose.hlsl
index a3d78113d58b6..a01305173db52 100644
--- a/clang/test/CodeGenHLSL/builtins/transpose.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/transpose.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROWMAJOR
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan1.3-library -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROWMAJOR
 
+using namespace hlsl;
+
 // CHECK-LABEL: define {{.*}}test_transpose_bool2x3
 // COLMAJOR:    [[A_ADDR:%.*]] = alloca [3 x <2 x i32>], align 4
 // ROWMAJOR:    [[A_ADDR:%.*]] = alloca [2 x <3 x i32>], align 4
diff --git a/clang/test/CodeGenHLSL/builtins/trunc-overloads.hlsl b/clang/test/CodeGenHLSL/builtins/trunc-overloads.hlsl
index bc2e620b07a06..b64d709ad6750 100644
--- a/clang/test/CodeGenHLSL/builtins/trunc-overloads.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/trunc-overloads.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s  \
 // RUN:   -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // CHECK: define [[FNATTRS]] float @_Z17test_trunc_doubled(
 // CHECK:    [[CONVI:%.*]] = fptrunc {{.*}} double %{{.*}} to float
 // CHECK:    [[V2:%.*]] = call {{.*}} float @llvm.trunc.f32(float [[CONVI]])
diff --git a/clang/test/CodeGenHLSL/builtins/trunc.hlsl b/clang/test/CodeGenHLSL/builtins/trunc.hlsl
index 713a39b5c1d2f..18ebdb9fdf441 100644
--- a/clang/test/CodeGenHLSL/builtins/trunc.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/trunc.hlsl
@@ -5,6 +5,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // NATIVE_HALF-LABEL: define hidden noundef nofpclass(nan inf) half @_Z15test_trunc_half
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn half @llvm.trunc.f16(
 // NO_HALF-LABEL: define hidden noundef nofpclass(nan inf) float @_Z15test_trunc_half
diff --git a/clang/test/CodeGenHLSL/builtins/trunc_mat.hlsl b/clang/test/CodeGenHLSL/builtins/trunc_mat.hlsl
index b21dd6d21f287..dd976ba8093b7 100644
--- a/clang/test/CodeGenHLSL/builtins/trunc_mat.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/trunc_mat.hlsl
@@ -6,6 +6,8 @@
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s --check-prefixes=CHECK,NO_HALF
 
+using namespace hlsl;
+
 // CHECK-LABEL: test_trunc_half1x2
 // NATIVE_HALF: call reassoc nnan ninf nsz arcp afn <2 x half> @llvm.trunc.v2f16
 // NO_HALF: call reassoc nnan ninf nsz arcp afn <2 x float> @llvm.trunc.v2f32
diff --git a/clang/test/CodeGenHLSL/builtins/wave_get_lane_index_simple.hlsl b/clang/test/CodeGenHLSL/builtins/wave_get_lane_index_simple.hlsl
index 9034cae254036..bc4373c9f5e63 100644
--- a/clang/test/CodeGenHLSL/builtins/wave_get_lane_index_simple.hlsl
+++ b/clang/test/CodeGenHLSL/builtins/wave_get_lane_index_simple.hlsl
@@ -6,6 +6,8 @@
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s \
 // RUN:   --check-prefixes=CHECK,CHECK-DXIL
 
+using namespace hlsl;
+
 // CHECK-SPIRV: define hidden spir_func noundef i32 @{{.*test_1.*}}() [[A0:#[0-9]+]] {
 // CHECK-DXIL: define hidden noundef i32 @{{.*test_1.*}}() [[A0:#[0-9]+]] {
 // CHECK-SPIRV: %[[CI:[0-9]+]] = call token @llvm.experimental.convergence.entry()
diff --git a/clang/test/CodeGenHLSL/cbuffer-matrix-layout-keyword.hlsl b/clang/test/CodeGenHLSL/cbuffer-matrix-layout-keyword.hlsl
index 8027df5d8c27b..f6c09f7cc2e2a 100644
--- a/clang/test/CodeGenHLSL/cbuffer-matrix-layout-keyword.hlsl
+++ b/clang/test/CodeGenHLSL/cbuffer-matrix-layout-keyword.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute %s -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=column-major -o - | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute %s -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - | FileCheck %s
 
+using namespace hlsl;
+
 // row_major float2x3 -> 2 rows of <3 x float>, 16-byte row stride:
 //   { [1 x { <3 x float>, pad(4) }], <3 x float> }
 // CHECK: %__cblayout_CB_RM = type <{ <{ [1 x <{ <3 x float>, target("dx.Padding", 4) }>], <3 x float> }> }>
diff --git a/clang/test/CodeGenHLSL/convergence/global_array.hlsl b/clang/test/CodeGenHLSL/convergence/global_array.hlsl
index f6d1293617ea3..b64d4ebb390db 100644
--- a/clang/test/CodeGenHLSL/convergence/global_array.hlsl
+++ b/clang/test/CodeGenHLSL/convergence/global_array.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: define internal{{.*}} void @__cxx_global_var_init()
 // CHECK: [[entry_token:%.*]] = call token @llvm.experimental.convergence.entry()
 // CHECK: br label %[[loop_entry:.*]]
diff --git a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
index 76ea87fd534c1..9484a08377efd 100644
--- a/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
+++ b/clang/test/CodeGenHLSL/debug/rwbuffer_debug_info.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -x hlsl -emit-llvm -disable-llvm-passes -o - -hlsl-entry main %s -debug-info-kind=standalone -dwarf-version=4  | FileCheck %s
 
+using namespace hlsl;
+
 
 // CHECK: [[DWTag:![0-9]+]] = distinct !DICompositeType(tag: DW_TAG_class_type, name: "RWBuffer<float>",
 // CHECK: [[thisType:![0-9]+]] = !DIDerivedType(tag: DW_TAG_reference_type, baseType: [[DWTag]], size: 32)
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/ArrTest.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/ArrTest.hlsl
index d7a1106f53a88..1cd97b06e8a54 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/ArrTest.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/ArrTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.0-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 groupshared float4 SharedArr[64];
 
 // CHECK-LABEL: define hidden void @_Z2fnRA64_U3AS3Dv4_ff(ptr addrspace(3) noundef align 4 dereferenceable(1024) %Arr, float noundef nofpclass(nan inf) %F)
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/MatrixTest.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/MatrixTest.hlsl
index 584ffeeaa646a..84f5824bacc06 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/MatrixTest.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/MatrixTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 groupshared float4x4 SharedData;
 
 // CHECK-LABEL: define hidden void @_Z3fn1RU3AS3u11matrix_typeILm4ELm4EfE(ptr addrspace(3) noundef align 4 dereferenceable(64) %Sh)
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/Overloads.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/Overloads.hlsl
index bc753009c0706..c6c74471bc663 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/Overloads.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/Overloads.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.0-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // Verify we are calling the correct overloads
 void fn(groupshared float4 Arr[2]);
 void fn(inout float4 Arr[2]);
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/Scalartest.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/Scalartest.hlsl
index 02303e449dd76..8f89d385bcf54 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/Scalartest.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/Scalartest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -fnative-half-type -fnative-int16-type -triple dxil-pc-shadermodel6.2-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 groupshared uint16_t SharedData;
 
 // CHECK-LABEL: define hidden void @_Z3fn1RU3AS3t(ptr addrspace(3) noundef align 2 dereferenceable(2) %Sh)
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/TemplateTest.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/TemplateTest.hlsl
index d6faa846655ac..f3bfd338cf0f3 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/TemplateTest.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/TemplateTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // In the case the template type is specified the groupshared attribute is preserved in the type
 // CHECK-LABEL: define linkonce_odr hidden void @_Z4tfooIU3AS3Dv4_iEvT_S2_(ptr addrspace(3) noundef align 4 dereferenceable(16) %a, ptr addrspace(3) noundef align 4 dereferenceable(16) %b)
 // CHECK: [[AAddr:%.*]] = alloca ptr addrspace(3), align 4
diff --git a/clang/test/CodeGenHLSL/groupsharedArgs/VectorTest.hlsl b/clang/test/CodeGenHLSL/groupsharedArgs/VectorTest.hlsl
index c19397b6bc5fd..05d60aeee8868 100644
--- a/clang/test/CodeGenHLSL/groupsharedArgs/VectorTest.hlsl
+++ b/clang/test/CodeGenHLSL/groupsharedArgs/VectorTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -std=hlsl202x -emit-llvm -disable-llvm-passes -hlsl-entry main -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 groupshared float4 SharedData;
 
 // CHECK-LABEL: define hidden void @_Z3fn1RU3AS3Dv4_f(ptr addrspace(3) noundef align 4 dereferenceable(16) %Sh)
diff --git a/clang/test/CodeGenHLSL/implicit-norecurse-attrib.hlsl b/clang/test/CodeGenHLSL/implicit-norecurse-attrib.hlsl
index ad581f14d8997..5497cc658250d 100644
--- a/clang/test/CodeGenHLSL/implicit-norecurse-attrib.hlsl
+++ b/clang/test/CodeGenHLSL/implicit-norecurse-attrib.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -x hlsl -triple dxil-pc-shadermodel6.3-library  -finclude-default-header %s -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 // RUN: %clang_cc1 -x hlsl -triple dxil-pc-shadermodel6.0-compute  -finclude-default-header %s -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // Verify that a few different function types all get the NoRecurse attribute
 
 #define MAX 100
diff --git a/clang/test/CodeGenHLSL/inline-functions.hlsl b/clang/test/CodeGenHLSL/inline-functions.hlsl
index d24c07cf5224f..4aaebccbbaf50 100644
--- a/clang/test/CodeGenHLSL/inline-functions.hlsl
+++ b/clang/test/CodeGenHLSL/inline-functions.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute %s -emit-llvm -O0 -o - | FileCheck %s --check-prefixes=CHECK,INLINE
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute %s -emit-llvm -O1 -o - | FileCheck %s --check-prefixes=CHECK,INLINE
 
+using namespace hlsl;
+
 // Tests that user functions will always be inlined.
 // This includes exported functions and mangled entry point implementation functions.
 // The unmangled entry functions must not be alwaysinlined.
diff --git a/clang/test/CodeGenHLSL/matrix-layout-attr-overrides-default.hlsl b/clang/test/CodeGenHLSL/matrix-layout-attr-overrides-default.hlsl
index fab480db3417c..06034463072c9 100644
--- a/clang/test/CodeGenHLSL/matrix-layout-attr-overrides-default.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-layout-attr-overrides-default.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=column-major -o - | FileCheck %s
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - | FileCheck %s
 
+using namespace hlsl;
+
 // Verifies that a per-decl `[[hlsl::row_major]]` / `[[hlsl::column_major]]`
 // (spelled `row_major` / `column_major` in HLSL) overrides the
 // `-fmatrix-memory-layout=` default at every CodeGen lowering site:
diff --git a/clang/test/CodeGenHLSL/matrix-layout-register-representation.hlsl b/clang/test/CodeGenHLSL/matrix-layout-register-representation.hlsl
index eff4dff366f52..f40dc88d1aed8 100644
--- a/clang/test/CodeGenHLSL/matrix-layout-register-representation.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-layout-register-representation.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.3-library \
 // RUN:   -emit-llvm -disable-llvm-passes -fmatrix-memory-layout=row-major -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 export float2x2 load_row_major(row_major float2x2 matrix) {
   return matrix;
 }
diff --git a/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-load.hlsl b/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-load.hlsl
index 09b40e215f88a..4cf3cbf488ad7 100644
--- a/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-load.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-load.hlsl
@@ -1,5 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple \
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
diff --git a/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-store.hlsl b/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-store.hlsl
index 868514b9de7c1..b3432cb390051 100644
--- a/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-store.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-one-based-accessor-scalar-store.hlsl
@@ -1,5 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple \
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
diff --git a/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-load.hlsl b/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-load.hlsl
index de6b78dc50862..80536a6b5ab1c 100644
--- a/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-load.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-load.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef <4 x i32> @_Z17ReturnOnesSwizzleu11matrix_typeILm4ELm4EiE(
 // CHECK-SAME: <16 x i32> noundef [[A:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-store.hlsl b/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-store.hlsl
index b30f62ec468ca..03b438939c741 100644
--- a/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-store.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-one-based-swizzle-store.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z19OnesSwizzleToScalarRu11matrix_typeILm4ELm4EiEi(
 // CHECK-SAME: ptr noalias noundef nonnull align 4 dereferenceable(64) [[A:%.*]], i32 noundef [[I:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-load.hlsl b/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-load.hlsl
index e076b881b7516..afa69152e2293 100644
--- a/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-load.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-load.hlsl
@@ -1,5 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple \
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
diff --git a/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-store.hlsl b/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-store.hlsl
index ba220b6dbb759..d9ae46795b21d 100644
--- a/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-store.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-zero-based-accessor-scalar-store.hlsl
@@ -1,5 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --version 6
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple \
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
diff --git a/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-load.hlsl b/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-load.hlsl
index 6c0953a54cd01..9cbe0c3851333 100644
--- a/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-load.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-load.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden noundef nofpclass(nan inf) <4 x half> @_Z18ReturnZerosSwizzleu11matrix_typeILm4ELm4EDhE(
 // CHECK-SAME: <16 x half> noundef nofpclass(nan inf) [[A:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-store.hlsl b/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-store.hlsl
index 011cadc93b53b..dbbae6c306833 100644
--- a/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-store.hlsl
+++ b/clang/test/CodeGenHLSL/matrix-member-zero-based-swizzle-store.hlsl
@@ -3,6 +3,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: define hidden void @_Z20ZerosSwizzleToScalarRu11matrix_typeILm4ELm4EdEd(
 // CHECK-SAME: ptr noalias noundef nonnull align 8 dereferenceable(128) [[A:%.*]], double noundef nofpclass(nan inf) [[D:%.*]]) #[[ATTR0:[0-9]+]] {
 // CHECK-NEXT:  [[ENTRY:.*:]]
diff --git a/clang/test/CodeGenHLSL/no_int_promotion.hlsl b/clang/test/CodeGenHLSL/no_int_promotion.hlsl
index eb1d5eb70f467..6b19b9860b727 100644
--- a/clang/test/CodeGenHLSL/no_int_promotion.hlsl
+++ b/clang/test/CodeGenHLSL/no_int_promotion.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.3-library %s -fnative-half-type -fnative-int16-type \
 // RUN:   -emit-llvm -disable-llvm-passes -O3 -o - | FileCheck %s %}
 
+using namespace hlsl;
+
 // FIXME: add test for char/int8_t/uint8_t when these types are supported in HLSL.
 //  See https://github.com/llvm/llvm-project/issues/58453.
 
diff --git a/clang/test/CodeGenHLSL/packed-types.hlsl b/clang/test/CodeGenHLSL/packed-types.hlsl
index 3b64faebbb74d..4ea22d589c41a 100644
--- a/clang/test/CodeGenHLSL/packed-types.hlsl
+++ b/clang/test/CodeGenHLSL/packed-types.hlsl
@@ -2,6 +2,8 @@
 // RUN:  -emit-llvm -disable-llvm-passes -o - | \
 // RUN:  FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: define {{.*}} void @_Z1fu14int8_t4_packedu15uint8_t4_packed(i32 %{{.*}}, i32 %{{.*}})
 void f(int8_t4_packed s_arg, uint8_t4_packed u_arg) {
   // CHECK: %{{.*}} = alloca i32, align 4
diff --git a/clang/test/CodeGenHLSL/resources-declared-only-once.hlsl b/clang/test/CodeGenHLSL/resources-declared-only-once.hlsl
index 0f726af70e552..9d0c6eabf690f 100644
--- a/clang/test/CodeGenHLSL/resources-declared-only-once.hlsl
+++ b/clang/test/CodeGenHLSL/resources-declared-only-once.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxilv1.7-unknown-shadermodel6.7-library -finclude-default-header -verify -emit-llvm -o - -x hlsl %s
 
+using namespace hlsl;
+
 // expected-warning at +1{{declaration does not declare anything}}
 RWStructuredBuffer<float>;
 RWStructuredBuffer<uint> a; 
diff --git a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-constructors.hlsl b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-constructors.hlsl
index 4d0e79f2ae88a..c67db172d814f 100644
--- a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-constructors.hlsl
@@ -4,6 +4,8 @@
 // RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | \
 //        llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types to support polymorphism:
 // - C1 - Complete object constructor - constructs the complete object, including virtual base classes.
 // - C2 - Base object constructor - creates the object itself and initializes data members and non-virtual base classes.
diff --git a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-matrix-legacy-order.hlsl b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-matrix-legacy-order.hlsl
index e1ee18a697373..76031befdf367 100644
--- a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-matrix-legacy-order.hlsl
+++ b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-matrix-legacy-order.hlsl
@@ -4,6 +4,8 @@
 // RUN:   -fspv-use-legacy-buffer-matrix-order -emit-llvm -disable-llvm-passes -o - %s \
 // RUN:   | FileCheck %s --check-prefixes=CHECK,LEGACY
 
+using namespace hlsl;
+
 // Raw buffers carry no layout information. By default, a matrix read from or
 // written to a raw buffer is assumed to be stored in column-major order,
 // matching the native in-register representation, so no reordering is
diff --git a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-methods.hlsl b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-methods.hlsl
index fc3e8fb6dc7f9..9f05eb1d9fd62 100644
--- a/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-methods.hlsl
+++ b/clang/test/CodeGenHLSL/resources/ByteAddressBuffers-methods.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,DXIL
 // RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPIRV
 
+using namespace hlsl;
+
 // NOTE: SPIRV codegen for resource methods is not yet implemented
 
 ByteAddressBuffer Buf : register(t0);
diff --git a/clang/test/CodeGenHLSL/resources/CBufferMatrixSingleSubscriptSwizzle.hlsl b/clang/test/CodeGenHLSL/resources/CBufferMatrixSingleSubscriptSwizzle.hlsl
index ad6c352add0e1..d2d8e3d035840 100644
--- a/clang/test/CodeGenHLSL/resources/CBufferMatrixSingleSubscriptSwizzle.hlsl
+++ b/clang/test/CodeGenHLSL/resources/CBufferMatrixSingleSubscriptSwizzle.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.7-library -disable-llvm-passes -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 cbuffer CB {
   float3x2 Mat;
 }
diff --git a/clang/test/CodeGenHLSL/resources/ConstantBufferT-struct-passing.hlsl b/clang/test/CodeGenHLSL/resources/ConstantBufferT-struct-passing.hlsl
index d20425fe54f07..0f1362ba5519f 100644
--- a/clang/test/CodeGenHLSL/resources/ConstantBufferT-struct-passing.hlsl
+++ b/clang/test/CodeGenHLSL/resources/ConstantBufferT-struct-passing.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:     llvm-cxxfilt | FileCheck %s -DCONST_ADDR_SPACE=2 -DPADDING_TYPE="dx.Padding" -check-prefixes=CHECK,CHECK-DXIL
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:     llvm-cxxfilt | FileCheck %s -DCONST_ADDR_SPACE=12 -DPADDING_TYPE="spirv.Padding" -check-prefixes=CHECK,CHECK-SPIRV
 
diff --git a/clang/test/CodeGenHLSL/resources/ConstantBufferT.hlsl b/clang/test/CodeGenHLSL/resources/ConstantBufferT.hlsl
index 41e8669d7a505..198a205f83f82 100644
--- a/clang/test/CodeGenHLSL/resources/ConstantBufferT.hlsl
+++ b/clang/test/CodeGenHLSL/resources/ConstantBufferT.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-vulkan-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:        llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,CHECK-SPV -DCONST_ADDR_SPACE=12 -DPADDING_TYPE="spirv.Padding"
 
+using namespace hlsl;
+
 struct S {
     float3 f3;
     int a;
diff --git a/clang/test/CodeGenHLSL/resources/Local-Resources/array.hlsl b/clang/test/CodeGenHLSL/resources/Local-Resources/array.hlsl
index d139c989203e4..3b7c7880370d1 100644
--- a/clang/test/CodeGenHLSL/resources/Local-Resources/array.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Local-Resources/array.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWByteAddressBuffer Out : register(u0);
 RWByteAddressBuffer Aux : register(u1);
 
diff --git a/clang/test/CodeGenHLSL/resources/Local-Resources/consolidated_assignments.hlsl b/clang/test/CodeGenHLSL/resources/Local-Resources/consolidated_assignments.hlsl
index f25d8f781249e..ca6361699e735 100644
--- a/clang/test/CodeGenHLSL/resources/Local-Resources/consolidated_assignments.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Local-Resources/consolidated_assignments.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -O1 -Wno-unused-value -o - | FileCheck %s
 
+using namespace hlsl;
+
 // Consolidated coverage for local-resource assignment/initialization patterns
 // that must fold to a single unique global binding.
 //
diff --git a/clang/test/CodeGenHLSL/resources/Local-Resources/init_from_global_array_dynamic_index.hlsl b/clang/test/CodeGenHLSL/resources/Local-Resources/init_from_global_array_dynamic_index.hlsl
index ac752cc73eeeb..1c3887b6bad42 100644
--- a/clang/test/CodeGenHLSL/resources/Local-Resources/init_from_global_array_dynamic_index.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Local-Resources/init_from_global_array_dynamic_index.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWByteAddressBuffer GBufArray[4] : register(u0);
 
 // CHECK-LABEL: define {{.*}}@main(
diff --git a/clang/test/CodeGenHLSL/resources/Local-Resources/static_local.hlsl b/clang/test/CodeGenHLSL/resources/Local-Resources/static_local.hlsl
index 57a37836c71cb..c445ba2bcd8e7 100644
--- a/clang/test/CodeGenHLSL/resources/Local-Resources/static_local.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Local-Resources/static_local.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWByteAddressBuffer GBuf0 : register(u0);
 
 void Pass_StaticLocal(uint Idx) {
diff --git a/clang/test/CodeGenHLSL/resources/Local-Resources/ternary_lvalue_unambiguous.hlsl b/clang/test/CodeGenHLSL/resources/Local-Resources/ternary_lvalue_unambiguous.hlsl
index ac257a94025f2..ec2bbd51c95ae 100644
--- a/clang/test/CodeGenHLSL/resources/Local-Resources/ternary_lvalue_unambiguous.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Local-Resources/ternary_lvalue_unambiguous.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -O1 -o - | FileCheck %s
 
+using namespace hlsl;
+
 RWByteAddressBuffer GBuf0 : register(u0);
 RWByteAddressBuffer GBuf1 : register(u1);
 
diff --git a/clang/test/CodeGenHLSL/resources/MatrixElement_cbuffer.hlsl b/clang/test/CodeGenHLSL/resources/MatrixElement_cbuffer.hlsl
index 8d2493bee2c0b..a8f6ab9fe0ed7 100644
--- a/clang/test/CodeGenHLSL/resources/MatrixElement_cbuffer.hlsl
+++ b/clang/test/CodeGenHLSL/resources/MatrixElement_cbuffer.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -emit-llvm -finclude-default-header -fmatrix-memory-layout=row-major \
 // RUN:   -o - %s | FileCheck %s --check-prefixes=CHECK,ROW-CHECK
 
+using namespace hlsl;
+
 
 cbuffer CB {
   float3x2 Mat;
diff --git a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-Load.hlsl b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-Load.hlsl
index f8cc6e2b72b62..d5b692b6fd599 100644
--- a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-Load.hlsl
+++ b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-Load.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -DLOCATION_TYPE=int2 -o - %s | FileCheck %s --check-prefix=DXIL -DCOORD_DIM=2 -DKIND=3
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -DLOCATION_TYPE=int2 -o - %s | FileCheck %s --check-prefix=SPIRV -DCOORD_DIM=2 -DARRAYED=0
 
+using namespace hlsl;
+
 // Load on a multisampled texture takes a separate sample index (rather than a
 // packed mip level) and lowers to the MS-specific resource.load.ms intrinsic on
 // a dx.MSTexture (DXIL) / multisampled spirv.Image (SPIR-V) handle. The correct
diff --git a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default-explicit-binding.hlsl b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default-explicit-binding.hlsl
index 045174314a383..01775c7c1fded 100644
--- a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default-explicit-binding.hlsl
+++ b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default-explicit-binding.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -DLOCATION_TYPE=int2 -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,DXIL -DTEXTURE=Texture2DMS -DCOORD_DIM=2 -DKIND=3
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -DLOCATION_TYPE=int2 -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPIRV -DTEXTURE=Texture2DMS -DCOORD_DIM=2 -DARRAYED=0
 
+using namespace hlsl;
+
 // A multisampled texture with an explicit register/space binding is initialized
 // from that binding through __createFromBinding, identically to a non-MS
 // texture; only the resource handle type differs (dx.MSTexture / a multisampled
diff --git a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default.hlsl b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default.hlsl
index e4980f3d2fb83..b10bd8a86e8b8 100644
--- a/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default.hlsl
+++ b/clang/test/CodeGenHLSL/resources/MultiSampledTextures-default.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -o - %s | FileCheck %s --check-prefix=DXIL -DTEXTURE=Texture2DMS -DDXIL_ARGS="<4 x float>, 0, 0, 0, 3" -DDXIL_ARGS4="<4 x float>, 0, 4, 0, 3"
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -finclude-default-header -DTEXTURE=Texture2DMS -o - %s | FileCheck %s --check-prefix=SPIRV -DTEXTURE=Texture2DMS -DSPIRV_ARGS="float, 1, 2, 0, 1, 1, 0"
 
+using namespace hlsl;
+
 // A multisampled texture lowers to a multisampled resource target type. For
 // DXIL this is the dedicated `dx.MSTexture` type carrying the multisampled
 // resource kind; for SPIR-V it is a `spirv.Image` with the Multisampled (MS)
diff --git a/clang/test/CodeGenHLSL/resources/NonUniformResourceIndex.hlsl b/clang/test/CodeGenHLSL/resources/NonUniformResourceIndex.hlsl
index 2b68c931f010c..3fb3169c7fff4 100644
--- a/clang/test/CodeGenHLSL/resources/NonUniformResourceIndex.hlsl
+++ b/clang/test/CodeGenHLSL/resources/NonUniformResourceIndex.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan1.3-compute -emit-llvm -disable-llvm-passes -o - %s \
 // RUN:   | llvm-cxxfilt | FileCheck -DTARGET=spv %s
 
+using namespace hlsl;
+
 RWBuffer<float> A[10];
 
 [numthreads(4,1,1)]
diff --git a/clang/test/CodeGenHLSL/resources/RWBuffer-constructor-opt.hlsl b/clang/test/CodeGenHLSL/resources/RWBuffer-constructor-opt.hlsl
index 8a08536ce133c..d4c010e964e35 100644
--- a/clang/test/CodeGenHLSL/resources/RWBuffer-constructor-opt.hlsl
+++ b/clang/test/CodeGenHLSL/resources/RWBuffer-constructor-opt.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -O3 -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple spirv-vulkan-compute -x hlsl -emit-llvm -O3 -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // All references to unused resources should be removed by optimizations.
 RWBuffer<float> Buf : register(u5, space3);
 
diff --git a/clang/test/CodeGenHLSL/resources/RWBuffer-imageformat.hlsl b/clang/test/CodeGenHLSL/resources/RWBuffer-imageformat.hlsl
index 6b967bb1e3e3a..72a87a0710b40 100644
--- a/clang/test/CodeGenHLSL/resources/RWBuffer-imageformat.hlsl
+++ b/clang/test/CodeGenHLSL/resources/RWBuffer-imageformat.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -finclude-default-header -fnative-half-type -emit-llvm -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // Signed integers
 // CHECK: %"class.hlsl::RWBuffer" = type { target("spirv.SignedImage", i32, 5, 2, 0, 0, 2, 24) }
 RWBuffer<int> rwb_int;
diff --git a/clang/test/CodeGenHLSL/resources/RasterizerOrderedStructuredBuffer-elementtype.hlsl b/clang/test/CodeGenHLSL/resources/RasterizerOrderedStructuredBuffer-elementtype.hlsl
index 105c3e25c6d10..bdf78115ddebb 100644
--- a/clang/test/CodeGenHLSL/resources/RasterizerOrderedStructuredBuffer-elementtype.hlsl
+++ b/clang/test/CodeGenHLSL/resources/RasterizerOrderedStructuredBuffer-elementtype.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute -finclude-default-header -fnative-half-type -fnative-int16-type -emit-llvm -o - %s | FileCheck %s -check-prefixes=DXIL
 
+using namespace hlsl;
+
 struct MyStruct {
   float4 a;
   int2 b;
diff --git a/clang/test/CodeGenHLSL/resources/StructuredBuffers-constructors.hlsl b/clang/test/CodeGenHLSL/resources/StructuredBuffers-constructors.hlsl
index 801e734de7cb5..5a137ce3ad138 100644
--- a/clang/test/CodeGenHLSL/resources/StructuredBuffers-constructors.hlsl
+++ b/clang/test/CodeGenHLSL/resources/StructuredBuffers-constructors.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:   llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,CHECK-SPV
 
+using namespace hlsl;
+
 // NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types to support polymorphism:
 // - C1 - Complete object constructor - constructs the complete object, including virtual base classes.
 // - C2 - Base object constructor - creates the object itself and initializes data members and non-virtual base classes.
diff --git a/clang/test/CodeGenHLSL/resources/StructuredBuffers-elementtype.hlsl b/clang/test/CodeGenHLSL/resources/StructuredBuffers-elementtype.hlsl
index 43f2e9cb7f333..83ae3b088a61c 100644
--- a/clang/test/CodeGenHLSL/resources/StructuredBuffers-elementtype.hlsl
+++ b/clang/test/CodeGenHLSL/resources/StructuredBuffers-elementtype.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute -finclude-default-header -fnative-half-type -fnative-int16-type \
 // RUN: -emit-llvm -o - -DRESOURCE=StructuredBuffer %s | FileCheck %s -DRESOURCE=StructuredBuffer -check-prefixes=DXIL-RO
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-compute -finclude-default-header -fnative-half-type -fnative-int16-type \
 // RUN: -emit-llvm -o - -DRESOURCE=StructuredBuffer %s | FileCheck %s -DRESOURCE=StructuredBuffer -check-prefixes=SPV-RO
 
diff --git a/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-lib.hlsl b/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-lib.hlsl
index 519e756a5738f..ae8affd9f0d42 100644
--- a/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-lib.hlsl
+++ b/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-lib.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,DXIL
 // RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // NOTE: SPIRV codegen for resource methods is not yet implemented
 
 StructuredBuffer<float> SB1 : register(t0);
diff --git a/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-ps.hlsl b/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-ps.hlsl
index 04908a23410e2..bbd22b32bf856 100644
--- a/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-ps.hlsl
+++ b/clang/test/CodeGenHLSL/resources/StructuredBuffers-methods-ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,DXIL
 // RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // NOTE: SPIRV codegen for resource methods is not yet implemented
 
 RasterizerOrderedStructuredBuffer<float> ROSB1;
diff --git a/clang/test/CodeGenHLSL/resources/StructuredBuffers-subscripts.hlsl b/clang/test/CodeGenHLSL/resources/StructuredBuffers-subscripts.hlsl
index 83a3aac79e18e..dc80e10193a52 100644
--- a/clang/test/CodeGenHLSL/resources/StructuredBuffers-subscripts.hlsl
+++ b/clang/test/CodeGenHLSL/resources/StructuredBuffers-subscripts.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -o - -O0 %s | FileCheck %s -check-prefixes=DXIL,CHECK
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-compute -emit-llvm -o - -O0 %s | FileCheck %s -check-prefixes=SPV,CHECK
 
+using namespace hlsl;
+
 struct S {
   float f;
 };
diff --git a/clang/test/CodeGenHLSL/resources/Textures-CalculateLevelOfDetail.hlsl b/clang/test/CodeGenHLSL/resources/Textures-CalculateLevelOfDetail.hlsl
index 9dcc077677eea..6e970ec0d4839 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-CalculateLevelOfDetail.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-CalculateLevelOfDetail.hlsl
@@ -12,6 +12,8 @@
 // RUN:   -DSAMPLED=1 -DIMG_FMT=0 -DSPV_DIM=0 -DGRAD_LLVM=float \
 // RUN:   -DGRAD_CXX=float
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DLOD_TYPE=float \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-Gather.hlsl b/clang/test/CodeGenHLSL/resources/Textures-Gather.hlsl
index 6ea41a88891d4..cea0619ff8be0 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-Gather.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-Gather.hlsl
@@ -18,6 +18,8 @@
 // RUN:   -DARRAYED=0 -DSAMPLED=1 -DIMG_FMT=0 -DSPV_DIM=1 -DDIM=2 \
 // RUN:   -DOFFSET_CONST="<i32 1, i32 2>"
 
+using namespace hlsl;
+
 // Texture2DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-GetDimensions.hlsl b/clang/test/CodeGenHLSL/resources/Textures-GetDimensions.hlsl
index 8c7c078cd0d0b..e9bfd9b8ce57c 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-GetDimensions.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-GetDimensions.hlsl
@@ -13,6 +13,8 @@
 // RUN:   | FileCheck %s --check-prefixes=CHECK,SPIRV -DTEXTURE=Texture2D \
 // RUN:   -DARRAYED=0 -DSAMPLED=1 -DIMG_FMT=0 -DSPV_DIM=1
 
+using namespace hlsl;
+
 // Texture2DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-Load.hlsl b/clang/test/CodeGenHLSL/resources/Textures-Load.hlsl
index 67b87daab860c..dc35f01778971 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-Load.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-Load.hlsl
@@ -20,6 +20,8 @@
 // RUN:   -DOFFSET_LLVM=i32 -DOFFSET_CXX=int -DOFFSET_ZERO=0 -DOFFSET_CONST=1 \
 // RUN:   -DENTRY_CXX=int -DLOAD_LLVM="<2 x i32>" -DLOAD_CXX="int vector[2]"
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -DENTRY_TYPE=int2 \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-Mips.hlsl b/clang/test/CodeGenHLSL/resources/Textures-Mips.hlsl
index 354aa39b2f6a6..26c84cc06bb9b 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-Mips.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-Mips.hlsl
@@ -19,6 +19,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DINDEX_LLVM=i32 \
 // RUN:   -DINDEX_CXX=int -DOFFSET_LLVM=i32 -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-pixel -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -hlsl-entry test_mips \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-Sample.hlsl b/clang/test/CodeGenHLSL/resources/Textures-Sample.hlsl
index 2959e12696ae5..595462beac3d4 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-Sample.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-Sample.hlsl
@@ -16,6 +16,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DOFFSET_LLVM=i32 \
 // RUN:   -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-SampleBias.hlsl b/clang/test/CodeGenHLSL/resources/Textures-SampleBias.hlsl
index 4c9d52081735d..b24b7153acb26 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-SampleBias.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-SampleBias.hlsl
@@ -16,6 +16,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DOFFSET_LLVM=i32 \
 // RUN:   -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-SampleCmp.hlsl b/clang/test/CodeGenHLSL/resources/Textures-SampleCmp.hlsl
index b08e3dd477cf9..5aeae8e3ca973 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-SampleCmp.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-SampleCmp.hlsl
@@ -16,6 +16,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DOFFSET_LLVM=i32 \
 // RUN:   -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-SampleCmpLevelZero.hlsl b/clang/test/CodeGenHLSL/resources/Textures-SampleCmpLevelZero.hlsl
index 2d5eda66d00fc..c60a44ad31359 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-SampleCmpLevelZero.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-SampleCmpLevelZero.hlsl
@@ -16,6 +16,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DOFFSET_LLVM=i32 \
 // RUN:   -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-SampleGrad.hlsl b/clang/test/CodeGenHLSL/resources/Textures-SampleGrad.hlsl
index a9e676b3b65c3..890712f1ad508 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-SampleGrad.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-SampleGrad.hlsl
@@ -19,6 +19,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DGRAD_LLVM=float \
 // RUN:   -DGRAD_CXX=float -DOFFSET_LLVM=i32 -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-SampleLevel.hlsl b/clang/test/CodeGenHLSL/resources/Textures-SampleLevel.hlsl
index 18975646e8442..cb44cea50202b 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-SampleLevel.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-SampleLevel.hlsl
@@ -16,6 +16,8 @@
 // RUN:   -DCOORD_LLVM=float -DCOORD_CXX=float -DOFFSET_LLVM=i32 \
 // RUN:   -DOFFSET_CXX=int -DOFFSET_ZERO=0
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -o - -DOFFSET_ARG="1" \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-Subscript.hlsl b/clang/test/CodeGenHLSL/resources/Textures-Subscript.hlsl
index 7dd765da8104a..c77a826ef1172 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-Subscript.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-Subscript.hlsl
@@ -15,6 +15,8 @@
 // RUN:   -DFMT_FLOAT4=0 -DFMT_FLOAT=0 -DFMT_INT3=0 -DSPV_DIM=0 \
 // RUN:   -DINDEX_LLVM=i32 -DINDEX_CXX_U="unsigned int"
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header -Wno-sign-conversion \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-default-explicit-binding.hlsl b/clang/test/CodeGenHLSL/resources/Textures-default-explicit-binding.hlsl
index f736241027a3a..bde17882ef294 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-default-explicit-binding.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-default-explicit-binding.hlsl
@@ -13,6 +13,8 @@
 // RUN:   | FileCheck %s -DTEXTURE=Texture2D -DCOORD_DIM=2 -DARRAYED=0 \
 // RUN:   --check-prefixes=SPIRV,SPIRV-TEXEL -DSPV_DIM=1
 
+using namespace hlsl;
+
 // Texture2DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -emit-llvm \
 // RUN:   -disable-llvm-passes -finclude-default-header \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-default.hlsl b/clang/test/CodeGenHLSL/resources/Textures-default.hlsl
index 69762453f7189..ccbde55e1de95 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-default.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-default.hlsl
@@ -13,6 +13,8 @@
 // RUN:   -DHANDLE_TY='target("spirv.Image", float, 0, 2, 0, 0, 1, 0)' \
 // RUN:   -DSCALAR_HANDLE_TY='target("spirv.Image", float, 0, 2, 0, 0, 1, 0)'
 
+using namespace hlsl;
+
 // Texture1DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl \
 // RUN:   -std=hlsl202x -emit-llvm -disable-llvm-passes \
diff --git a/clang/test/CodeGenHLSL/resources/Textures-shorthand-contexts.hlsl b/clang/test/CodeGenHLSL/resources/Textures-shorthand-contexts.hlsl
index 46a24b7b078fd..87af76bc2f2eb 100644
--- a/clang/test/CodeGenHLSL/resources/Textures-shorthand-contexts.hlsl
+++ b/clang/test/CodeGenHLSL/resources/Textures-shorthand-contexts.hlsl
@@ -7,6 +7,8 @@
 // RUN:   | FileCheck %s -DTEXTURE=Texture2D -DCOORD_DIM=2 -DDXIL_TY=2 -DRW=0 \
 // RUN:   --check-prefixes=CHECK,CHECK-TEXEL
 
+using namespace hlsl;
+
 // Texture2DArray
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl \
 // RUN:   -finclude-default-header -emit-llvm -disable-llvm-passes \
diff --git a/clang/test/CodeGenHLSL/resources/TypedBuffers-constructor.hlsl b/clang/test/CodeGenHLSL/resources/TypedBuffers-constructor.hlsl
index da2f923146d31..6135cef3af72c 100644
--- a/clang/test/CodeGenHLSL/resources/TypedBuffers-constructor.hlsl
+++ b/clang/test/CodeGenHLSL/resources/TypedBuffers-constructor.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:   llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // NOTE: Itanium ABI for C++ requires Clang to generate 2 constructors types to support polymorphism:
 // - C1 - Complete object constructor - constructs the complete object, including virtual base classes.
 // - C2 - Base object constructor - creates the object itself and initializes data members and non-virtual base classes.
diff --git a/clang/test/CodeGenHLSL/resources/TypedBuffers-elementtype.hlsl b/clang/test/CodeGenHLSL/resources/TypedBuffers-elementtype.hlsl
index 7d59bc5fed5ea..7eb397aa257db 100644
--- a/clang/test/CodeGenHLSL/resources/TypedBuffers-elementtype.hlsl
+++ b/clang/test/CodeGenHLSL/resources/TypedBuffers-elementtype.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-compute -finclude-default-header -fnative-half-type -fnative-int16-type  \
 // RUN: -emit-llvm -o - -DRESOURCE=Buffer %s | FileCheck %s -DRESOURCE=Buffer -DRW=0 -check-prefixes=DXIL
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -finclude-default-header -fnative-half-type -fnative-int16-type \
 // RUN: -emit-llvm -o - -DRESOURCE=Buffer %s | FileCheck %s -DRESOURCE=Buffer -DRW=1 -check-prefixes=SPV-RO
 
diff --git a/clang/test/CodeGenHLSL/resources/TypedBuffers-methods.hlsl b/clang/test/CodeGenHLSL/resources/TypedBuffers-methods.hlsl
index 42950c399193d..0703fa4a8af59 100644
--- a/clang/test/CodeGenHLSL/resources/TypedBuffers-methods.hlsl
+++ b/clang/test/CodeGenHLSL/resources/TypedBuffers-methods.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,DXIL
 // RUN-DISABLED: %clang_cc1 -triple spirv-vulkan-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPIRV
 
+using namespace hlsl;
+
 // NOTE: SPIRV codegen for resource methods is not yet implemented
 
 Buffer<float> Buf : register(t0);
diff --git a/clang/test/CodeGenHLSL/resources/TypedBuffers-subscript.hlsl b/clang/test/CodeGenHLSL/resources/TypedBuffers-subscript.hlsl
index ac6932d362e37..f9bb894213ce3 100644
--- a/clang/test/CodeGenHLSL/resources/TypedBuffers-subscript.hlsl
+++ b/clang/test/CodeGenHLSL/resources/TypedBuffers-subscript.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -o - -O0 %s | FileCheck %s --check-prefixes=DXIL,CHECK
 // RUN: %clang_cc1 -triple spirv1.6-pc-vulkan1.3-compute -fspv-use-unknown-image-format -emit-llvm -o - -O0 %s | FileCheck %s --check-prefixes=SPIRV,CHECK
 
+using namespace hlsl;
+
 Buffer<int> In;
 RWBuffer<int> Out;
 
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer-empty-struct-array.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer-empty-struct-array.hlsl
index 2184f8fe7cda6..746963805ef72 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer-empty-struct-array.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer-empty-struct-array.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -emit-llvm -disable-llvm-passes \
 // RUN:     -finclude-default-header -o - -DCHECK2 %s | FileCheck %s -check-prefix=CHECK2
 
+using namespace hlsl;
+
 // Regression test for issue llvm/llvm-project#183788
 
 // empty struct
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer.hlsl
index 39e0f468a1b69..412438bffaa94 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %__cblayout_CBScalars = type <{
 // CHECK-SAME:   float, target("dx.Padding", 4), double,
 // CHECK-SAME:   half, target("dx.Padding", 6), i64,
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_geps.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_geps.hlsl
index 9cde7574ed623..a4c10c4033931 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_geps.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_geps.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // Capture the anonymous struct types for check lines below.
 // CHECK: [[ANON_1:%.*]] = type <{ float, target("dx.Padding", 12), <4 x i32> }>
 // CHECK: [[ANON_2:%.*]] = type <{ <2 x i32>, target("dx.Padding", 8), <{ [3 x <{ %ArrayAndScalar, target("dx.Padding", 12) }>], %ArrayAndScalar }>
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_matrix_align.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_matrix_align.hlsl
index 70b2732372691..458cb8b8cc833 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_matrix_align.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_matrix_align.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library %s -fnative-half-type -fsyntax-only -verify -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 cbuffer MatArr0Pass {
   float2x4 A0p[2] : packoffset(c0.x);
   float    a0tail : packoffset(c4.x);
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.hlsl
index ece4586fbb3d3..9c10a4bfa99ea 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:     FileCheck %s -DCONST_ADDR_SPACE=2 -DPADDING_TYPE="dx.Padding"
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | \
 // RUN:     FileCheck %s -DCONST_ADDR_SPACE=12 -DPADDING_TYPE="spirv.Padding"
 
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.logical.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.logical.hlsl
index 4f940880bbd8f..1811541cb8605 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.logical.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing.logical.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s -fexperimental-logical-pointer | FileCheck %s --check-prefixes=CHECK-DXIL
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s -fexperimental-logical-pointer | FileCheck %s --check-prefixes=CHECK-SPIR
 
+using namespace hlsl;
+
 struct S {
   float3 a;
   float4 b;
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing_with_resources.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing_with_resources.hlsl
index 5804a8bcc3cb1..e2cea46808473 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing_with_resources.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_struct_passing_with_resources.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 struct MyStruct {
   int a;
   RWBuffer<float> Buf;
diff --git a/clang/test/CodeGenHLSL/resources/cbuffer_with_packoffset.hlsl b/clang/test/CodeGenHLSL/resources/cbuffer_with_packoffset.hlsl
index ad8d619e9ac3b..6a9a48ce5a3fd 100644
--- a/clang/test/CodeGenHLSL/resources/cbuffer_with_packoffset.hlsl
+++ b/clang/test/CodeGenHLSL/resources/cbuffer_with_packoffset.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.3-compute %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK:      %__cblayout_CB = type <{
 // CHECK-SAME:   target("dx.Padding", 16),
 // CHECK-SAME:   float,
diff --git a/clang/test/CodeGenHLSL/resources/default_cbuffer.hlsl b/clang/test/CodeGenHLSL/resources/default_cbuffer.hlsl
index 6abc337ca869d..cd0d246e749cb 100644
--- a/clang/test/CodeGenHLSL/resources/default_cbuffer.hlsl
+++ b/clang/test/CodeGenHLSL/resources/default_cbuffer.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -fnative-half-type -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,DXIL
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan1.3-compute -fnative-half-type -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,SPIRV
 
+using namespace hlsl;
+
 // CHECK: %"__cblayout_$Globals" = type <{ float, float, target("{{.*}}.Padding", 8), %__cblayout_S }>
 // CHECK: %__cblayout_S = type <{ float }>
 
diff --git a/clang/test/CodeGenHLSL/resources/default_cbuffer_with_layout.hlsl b/clang/test/CodeGenHLSL/resources/default_cbuffer_with_layout.hlsl
index 8bc2b8ee59fda..039f99a77c3f9 100644
--- a/clang/test/CodeGenHLSL/resources/default_cbuffer_with_layout.hlsl
+++ b/clang/test/CodeGenHLSL/resources/default_cbuffer_with_layout.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK:      %"__cblayout_$Globals" = type <{
 // CHECK-SAME:   float,
 // CHECK-SAME:   target("dx.Padding", 12),
diff --git a/clang/test/CodeGenHLSL/resources/dynamic-resources.hlsl b/clang/test/CodeGenHLSL/resources/dynamic-resources.hlsl
index 18b3a7957a0e4..5e15ee7cf042b 100644
--- a/clang/test/CodeGenHLSL/resources/dynamic-resources.hlsl
+++ b/clang/test/CodeGenHLSL/resources/dynamic-resources.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-vulkan-library \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s --check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // CHECK: %S = type <{ i32 }>
 
 // CHECK: @hlsl::ResourceDescriptorHeap = internal {{.*}}global %"struct.hlsl::__detail::resource_descriptor_heap_struct" zeroinitializer, align 1
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-dyn-index.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-dyn-index.hlsl
index 3800a09382d2b..0427b2a327e1f 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-dyn-index.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-dyn-index.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: @[[BufA:.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 
 RWBuffer<float> A[4][3] : register(u2);
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-multi-dim.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-multi-dim.hlsl
index 8264649bbaa8d..e50a9c9f91202 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-multi-dim.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-multi-dim.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: @[[BufB:.*]] = private unnamed_addr constant [2 x i8] c"B\00", align 1
 // CHECK: @[[BufC:.*]] = private unnamed_addr constant [2 x i8] c"C\00", align 1
 // CHECK: @[[BufD:.*]] = private unnamed_addr constant [2 x i8] c"D\00", align 1
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-subarray-many.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-subarray-many.hlsl
index 8c26c0dbc812b..3c05e36f9215f 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-subarray-many.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-subarray-many.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: @[[BufA:.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 
 RWBuffer<float> A[5][4][3][2] : register(u10, space2);
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-subarray-one.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-subarray-one.hlsl
index 355304b864a7a..4d9bb163e3aaa 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-subarray-one.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-subarray-one.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: @[[BufA:.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 
 RWBuffer<float> A[4][2] : register(u10, space2);
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-to-local.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-to-local.hlsl
index 44a9ae6695e77..52a165ba6d08b 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-to-local.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-to-local.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s -check-prefixes=CHECK
 
+using namespace hlsl;
+
 // CHECK: [[BufA:@.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 // CHECK: [[BufB:@.*]] = private unnamed_addr constant [2 x i8] c"B\00", align 1
 
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global-unbounded.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global-unbounded.hlsl
index 5e0e086492815..55c4529c9a537 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global-unbounded.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global-unbounded.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s -check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // CHECK: @[[BufA:.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 // CHECK: @[[BufB:.*]] = private unnamed_addr constant [2 x i8] c"B\00", align 1
 
diff --git a/clang/test/CodeGenHLSL/resources/res-array-global.hlsl b/clang/test/CodeGenHLSL/resources/res-array-global.hlsl
index bc1f7f06ce652..99ff759d66e46 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-global.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-global.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-compute \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s -check-prefixes=CHECK,SPV
 
+using namespace hlsl;
+
 // CHECK: @[[BufA:.*]] = private unnamed_addr constant [2 x i8] c"A\00", align 1
 // CHECK: @[[BufB:.*]] = private unnamed_addr constant [2 x i8] c"B\00", align 1
 // CHECK: @[[BufC:.*]] = private unnamed_addr constant [2 x i8] c"C\00", align 1
diff --git a/clang/test/CodeGenHLSL/resources/res-array-local-multi-dim.hlsl b/clang/test/CodeGenHLSL/resources/res-array-local-multi-dim.hlsl
index 0f0e5907f9a66..f90a4d1c1475b 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-local-multi-dim.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-local-multi-dim.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies handling of multi-dimensional local arrays of resources
 // when used as a function argument and local variable.
 
diff --git a/clang/test/CodeGenHLSL/resources/res-array-local1.hlsl b/clang/test/CodeGenHLSL/resources/res-array-local1.hlsl
index eaf2e2781da30..6e79bf633269a 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-local1.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-local1.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies local arrays of resources in HLSL.
 
 // CHECK: @_ZL1A = internal global %"class.hlsl::RWBuffer" poison, align 4
diff --git a/clang/test/CodeGenHLSL/resources/res-array-local2.hlsl b/clang/test/CodeGenHLSL/resources/res-array-local2.hlsl
index 0aaa608258669..62ab0813fbd49 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-local2.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-local2.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies handling of local arrays of resources when used as a function argument.
 
 // Resource array elements are initialized on access; there should never a global
diff --git a/clang/test/CodeGenHLSL/resources/res-array-local3.hlsl b/clang/test/CodeGenHLSL/resources/res-array-local3.hlsl
index 55da9e0b98936..cb4ecd2032039 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-local3.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-local3.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies handling of local arrays of resources when used
 // as a function argument that is modified inside the function.
 
diff --git a/clang/test/CodeGenHLSL/resources/res-array-rw-counter.hlsl b/clang/test/CodeGenHLSL/resources/res-array-rw-counter.hlsl
index 783e5383c60a5..fdc0d0df19650 100644
--- a/clang/test/CodeGenHLSL/resources/res-array-rw-counter.hlsl
+++ b/clang/test/CodeGenHLSL/resources/res-array-rw-counter.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
 // RUN: %clang_cc1 -triple spirv-vulkan-library -x hlsl -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPV
 
+using namespace hlsl;
+
 // CHECK-DXIL: %"class.hlsl::RWStructuredBuffer" = type { target("dx.RawBuffer", float, 1, 0), target("dx.RawBuffer", float, 1, 0) }
 // CHECK-SPV: %"class.hlsl::RWStructuredBuffer" = type { target("spirv.VulkanBuffer", [0 x float], 12, 1), target("spirv.VulkanBuffer", i32, 12, 1) }
 
diff --git a/clang/test/CodeGenHLSL/resources/resource-bindings.hlsl b/clang/test/CodeGenHLSL/resources/resource-bindings.hlsl
index bd451874c123d..375de481f6ae7 100644
--- a/clang/test/CodeGenHLSL/resources/resource-bindings.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resource-bindings.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil--shadermodel6.6-compute -x hlsl -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", <4 x float>, 1, 0, 0) }
 // CHECK: %"class.hlsl::RWBuffer.0" = type { target("dx.TypedBuffer", float, 1, 0, 0) }
 // CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", i32, 0, 0) }
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-array-to-local.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-array-to-local.hlsl
index 0a83517f36cbc..b5ad1bb01d35f 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-array-to-local.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-array-to-local.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header \
 // RUN:   -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s -check-prefixes=CHECK
 
+using namespace hlsl;
+
 // CHECK: @A.Bufs.str = private unnamed_addr constant [7 x i8] c"A.Bufs\00", align 1
 // CHECK: @B.Bufs.str = private unnamed_addr constant [7 x i8] c"B.Bufs\00", align 1
 
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-array.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-array.hlsl
index 3b25c3d80dfb9..620346cd0062d 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-array.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-array.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", float, 1, 0, 0) }
 
 // Array of structs with resources
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-inheritance.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-inheritance.hlsl
index 91a49d2c4f9e8..0da804d864085 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-inheritance.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-inheritance.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", float, 1, 0, 0) }
 // CHECK: %"class.hlsl::StructuredBuffer" = type { target("dx.RawBuffer", float, 0, 0) }
 // CHECK: %"class.hlsl::SamplerState" = type { target("dx.Sampler", 0) }
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-method-call.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-method-call.hlsl
index d9b01a0f0141a..60734bcfb0ae9 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-method-call.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-method-call.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -finclude-default-header -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 struct MyStruct {
   float f;
   RWBuffer<float> Buf;
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-no-global.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-no-global.hlsl
index ce6f2707d11c6..f284ec3da9700 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-no-global.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-no-global.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple spirv1.6-unknown-vulkan1.3-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %if spirv-registered-target && spirv-val %{ %clang_cc1 -triple spirv1.6-unknown-vulkan1.3-compute -O3 -emit-obj -o %t.spv %s && spirv-val --target-env vulkan1.3 %t.spv %}
 
+using namespace hlsl;
+
 // When processing a struct containing resources, we should split members recursively into
 // their own global variables, and not emit a global of struct or array of
 // struct type which contains a resource
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs-static-global.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs-static-global.hlsl
index 645de9276be2d..ddcace55dc60e 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs-static-global.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs-static-global.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple spirv1.6-unknown-vulkan1.3-compute -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // We should not split global struct instances containing resources when they are
 // static
 
diff --git a/clang/test/CodeGenHLSL/resources/resources-in-structs.hlsl b/clang/test/CodeGenHLSL/resources/resources-in-structs.hlsl
index 35dc7017f4279..cdd77415371b1 100644
--- a/clang/test/CodeGenHLSL/resources/resources-in-structs.hlsl
+++ b/clang/test/CodeGenHLSL/resources/resources-in-structs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: %"class.hlsl::RWBuffer" = type { target("dx.TypedBuffer", float, 1, 0, 0) }
 
 // Single resource field in struct.
diff --git a/clang/test/CodeGenHLSL/semantics/DispatchThreadID-noindex.hlsl b/clang/test/CodeGenHLSL/semantics/DispatchThreadID-noindex.hlsl
index cf0c75479ddd9..0c83fda38379a 100644
--- a/clang/test/CodeGenHLSL/semantics/DispatchThreadID-noindex.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/DispatchThreadID-noindex.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 [shader("compute")]
 [numthreads(8,8,1)]
 void foo(uint Idx : SV_DispatchThreadID1) {
diff --git a/clang/test/CodeGenHLSL/semantics/DispatchThreadID.hlsl b/clang/test/CodeGenHLSL/semantics/DispatchThreadID.hlsl
index b0abaeddff422..71c797739501a 100644
--- a/clang/test/CodeGenHLSL/semantics/DispatchThreadID.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/DispatchThreadID.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 // Make sure SV_DispatchThreadID translated into dx.thread.id.
 
 // CHECK:       define void @foo()
diff --git a/clang/test/CodeGenHLSL/semantics/SV_Barycentrics-half.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_Barycentrics-half.ps.hlsl
index 7b22e06dff284..5f6d2f9a4b62d 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_Barycentrics-half.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_Barycentrics-half.ps.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -fnative-half-type -finclude-default-header -DINTERPOLATION=linear -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=SPIRV,SPIRV-PERSPECTIVE
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -fnative-half-type -finclude-default-header -DINTERPOLATION=noperspective -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=SPIRV,SPIRV-AFFINE
 
+using namespace hlsl;
+
 #ifndef INTERPOLATION
 #define INTERPOLATION
 #endif
diff --git a/clang/test/CodeGenHLSL/semantics/SV_Barycentrics.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_Barycentrics.ps.hlsl
index e465266416778..a288a9ce5f971 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_Barycentrics.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_Barycentrics.ps.hlsl
@@ -10,6 +10,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -DCENTROID -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=SPIRV,SPIRV-AFFINE,SPIRV-CENTROID
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -DPERSPECTIVE -DSAMPLE -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=SPIRV,SPIRV-PERSPECTIVE,SPIRV-SAMPLE
 
+using namespace hlsl;
+
 #ifdef CENTROID
 #define SAMPLING centroid
 #elif defined(SAMPLE)
diff --git a/clang/test/CodeGenHLSL/semantics/SV_GroupID-noindex.hlsl b/clang/test/CodeGenHLSL/semantics/SV_GroupID-noindex.hlsl
index 31f5bca195d57..820cf6733a30f 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_GroupID-noindex.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_GroupID-noindex.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 [shader("compute")]
 [numthreads(8,8,1)]
 void foo(uint Idx : SV_GroupID1) {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_GroupID.hlsl b/clang/test/CodeGenHLSL/semantics/SV_GroupID.hlsl
index 62985f9d1e2a7..8e66ca1b81f5b 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_GroupID.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_GroupID.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 // Make sure SV_GroupID translated into dx.group.id for directx target and spv.group.id for spirv target.
 
 // CHECK:       define void @foo()
diff --git a/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID-noindex.hlsl b/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID-noindex.hlsl
index 5f34118cdc4b0..34ba969fe3127 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID-noindex.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID-noindex.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 [shader("compute")]
 [numthreads(8,8,1)]
 void foo(uint Idx : SV_GroupThreadID1) {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID.hlsl b/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID.hlsl
index 2675c973b531a..96be0f9e60c1e 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_GroupThreadID.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 // Make sure SV_GroupThreadID translated into dx.thread.id.in.group for directx target and spv.thread.id.in.group for spirv target.
 
 // CHECK:       define void @foo()
diff --git a/clang/test/CodeGenHLSL/semantics/SV_InstanceID.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_InstanceID.vs.hlsl
index 363369356c661..9c83de3715f90 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_InstanceID.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_InstanceID.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.8-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-DXIL %s
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV  %s
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_InstanceID = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#MD_0:]]
 
 // CHECK: define void @main() {{.*}} {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_Position.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_Position.ps.hlsl
index b1a0a2b16c3d1..20c9370924e94 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_Position.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_Position.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-DXIL
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_Position = external hidden thread_local addrspace(7) externally_initialized constant <4 x float>, !spirv.Decorations ![[#MD_0:]]
 
 // CHECK: define void @main() {{.*}} {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_Position.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_Position.vs.hlsl
index 072f056e60b69..5cc84faca06fa 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_Position.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_Position.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.8-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-DXIL %s
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV  %s
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_Position0 = external hidden thread_local addrspace(7) externally_initialized constant <4 x i32>, !spirv.Decorations ![[#MD_0:]]
 // CHECK-SPIRV: @SV_Position = external hidden thread_local addrspace(8) global <4 x float>, !spirv.Decorations ![[#MD_2:]]
 
diff --git a/clang/test/CodeGenHLSL/semantics/SV_PrimitiveID.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_PrimitiveID.ps.hlsl
index e5de69f58f2e5..5203444161971 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_PrimitiveID.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_PrimitiveID.ps.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -fnative-half-type -fnative-int16-type -disable-llvm-passes -DINT16 -o - %s | FileCheck --check-prefix=CHECK-SPIRV16 %s
 
+using namespace hlsl;
+
 #ifdef INT16
 #define TYPE int16_t
 #else
diff --git a/clang/test/CodeGenHLSL/semantics/SV_SampleIndex.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_SampleIndex.ps.hlsl
index ebbaf33f79e21..8576728d6fcc2 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_SampleIndex.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_SampleIndex.ps.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -fnative-half-type -fnative-int16-type -disable-llvm-passes -DINT16 -o - %s | FileCheck --check-prefix=SPIRV16 %s
 
+using namespace hlsl;
+
 #ifdef INT16
 #define TYPE int16_t
 #else
diff --git a/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.ps.hlsl
index 64bc4e97f7107..d60ea2714702b 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.4-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-DXIL
 
+using namespace hlsl;
+
 // Behavior parity with DXC's hlsl/semantics/sv_shadingrate/shadingrate1.hlsl.
 
 // CHECK-SPIRV-DAG: @SV_ShadingRate = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#MD_0:]]
diff --git a/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.vs.hlsl
index 46c0ad94ff428..e7002cf40185e 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_ShadingRate.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.4-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-DXIL
 
+using namespace hlsl;
+
 // Behavior parity with DXC's hlsl/semantics/sv_shadingrate/shadingrate2.hlsl.
 
 struct VS_OUT {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_StartInstanceLocation.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_StartInstanceLocation.vs.hlsl
index fc52faea8e01d..01e040a49516a 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_StartInstanceLocation.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_StartInstanceLocation.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-DXIL %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV %s
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_StartInstanceLocation = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#MD_0:]]
 
 // The start instance is read with a dedicated operation and is not part of the
diff --git a/clang/test/CodeGenHLSL/semantics/SV_StartVertexLocation.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_StartVertexLocation.vs.hlsl
index f016ceec3f263..a02ff2f746ef7 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_StartVertexLocation.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_StartVertexLocation.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-DXIL %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV %s
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_StartVertexLocation = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#MD_0:]]
 
 // The start vertex is read with a dedicated operation and is not part of the
diff --git a/clang/test/CodeGenHLSL/semantics/SV_Target.ps.hlsl b/clang/test/CodeGenHLSL/semantics/SV_Target.ps.hlsl
index ae216d821750c..11d791b42216d 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_Target.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_Target.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-DXIL
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_Target0 = external hidden thread_local addrspace(8) global <4 x float>, !spirv.Decorations ![[#MD_2:]]
 
 // CHECK: define void @main() {{.*}} {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_VertexID.vs.hlsl b/clang/test/CodeGenHLSL/semantics/SV_VertexID.vs.hlsl
index c965432b923db..5cc1fc8cd65bd 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_VertexID.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_VertexID.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.8-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-DXIL %s
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefix=CHECK-SPIRV  %s
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_VertexID = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#MD_0:]]
 
 // CHECK: define void @main() {{.*}} {
diff --git a/clang/test/CodeGenHLSL/semantics/SV_ViewID.hlsl b/clang/test/CodeGenHLSL/semantics/SV_ViewID.hlsl
index 71be4e2e6e00f..40e5fcfc7db34 100644
--- a/clang/test/CodeGenHLSL/semantics/SV_ViewID.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/SV_ViewID.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefixes=CHECK-SPIRV,SPIRV-VS %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck --check-prefixes=CHECK-SPIRV,SPIRV-PS %s
 
+using namespace hlsl;
+
 #if __SHADER_TARGET_STAGE == __SHADER_STAGE_PIXEL
 #define OUTPUT SV_Target
 #else
diff --git a/clang/test/CodeGenHLSL/semantics/compute-id-16bit.hlsl b/clang/test/CodeGenHLSL/semantics/compute-id-16bit.hlsl
index 303ff4b8f9765..78e5d5d1b7157 100644
--- a/clang/test/CodeGenHLSL/semantics/compute-id-16bit.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/compute-id-16bit.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -DSEMANTIC=SV_GroupThreadID -o - %s | FileCheck %s -DINTRINSIC=spv.thread.id.in.group.i32
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -DSEMANTIC=SV_GroupID -o - %s | FileCheck %s -DINTRINSIC=spv.group.id.i32
 
+using namespace hlsl;
+
 // Both signed and unsigned 16-bit inputs truncate the i32 intrinsic result.
 // CHECK-LABEL: define void @signed_scalar()
 // CHECK: %[[RAW:.*]] = call i32 @llvm.[[INTRINSIC]](i32 0)
diff --git a/clang/test/CodeGenHLSL/semantics/flat-decoration.ps.hlsl b/clang/test/CodeGenHLSL/semantics/flat-decoration.ps.hlsl
index 5e97be23386bd..0044d42e19e99 100644
--- a/clang/test/CodeGenHLSL/semantics/flat-decoration.ps.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/flat-decoration.ps.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 
+using namespace hlsl;
+
 // CHECK-SPIRV-DAG:  @A0 = external hidden thread_local addrspace(7) externally_initialized constant float, !spirv.Decorations ![[#FLOAT_MD:]]
 // CHECK-SPIRV-DAG:  @B0 = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#INT_MD:]]
 // CHECK-SPIRV-DAG:  @C0 = external hidden thread_local addrspace(7) externally_initialized constant double, !spirv.Decorations ![[#DOUBLE_MD:]]
diff --git a/clang/test/CodeGenHLSL/semantics/interpolation-aggregate.hlsl b/clang/test/CodeGenHLSL/semantics/interpolation-aggregate.hlsl
index 12a0ad43c3d1e..02c1f442fbd7d 100644
--- a/clang/test/CodeGenHLSL/semantics/interpolation-aggregate.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/interpolation-aggregate.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=SPIRV
 
+using namespace hlsl;
+
 struct Inner {
   float inherited;
   linear float overridden;
diff --git a/clang/test/CodeGenHLSL/semantics/interpolation-spirv.hlsl b/clang/test/CodeGenHLSL/semantics/interpolation-spirv.hlsl
index 53c798fc87a4f..e164a7d6f8ee8 100644
--- a/clang/test/CodeGenHLSL/semantics/interpolation-spirv.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/interpolation-spirv.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -Wno-ignored-attributes -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,PS -DAS=7 -DBUILTIN=15
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -DVERTEX -finclude-default-header -Wno-ignored-attributes -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,VS -DAS=8 -DBUILTIN=0
 
+using namespace hlsl;
+
 struct Inner {
   float inherited;
   linear float overridden;
diff --git a/clang/test/CodeGenHLSL/semantics/interpolation-vs-ps-link.hlsl b/clang/test/CodeGenHLSL/semantics/interpolation-vs-ps-link.hlsl
index 1e118bc27fcdc..9eae485d3bbef 100644
--- a/clang/test/CodeGenHLSL/semantics/interpolation-vs-ps-link.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/interpolation-vs-ps-link.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct Nested {
   float inherited : INHERIT;
   linear float overrideMode : OVERRIDE;
diff --git a/clang/test/CodeGenHLSL/semantics/interpolation.hlsl b/clang/test/CodeGenHLSL/semantics/interpolation.hlsl
index 14d3f4651667d..1121a8f141e99 100644
--- a/clang/test/CodeGenHLSL/semantics/interpolation.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/interpolation.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -Wno-ignored-attributes -emit-llvm -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 [shader("pixel")]
 float4 modes(float a : A,
              nointerpolation float b : B,
diff --git a/clang/test/CodeGenHLSL/semantics/semantic-struct-1.hlsl b/clang/test/CodeGenHLSL/semantics/semantic-struct-1.hlsl
index ddd0baed41f37..407a6df4cfc3b 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic-struct-1.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic-struct-1.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 
 struct Input {
   uint Idx : SV_DispatchThreadID;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic-struct-2.hlsl b/clang/test/CodeGenHLSL/semantics/semantic-struct-2.hlsl
index 0d9c91e746454..b7a37d3d559fd 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic-struct-2.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic-struct-2.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 
 struct Input {
   uint Idx : SV_DispatchThreadID;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-inherit.hlsl b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-inherit.hlsl
index f4c4d86933ca1..aab2fb516df65 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-inherit.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-inherit.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 
 struct Inner {
   uint Gid;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-shadow.hlsl b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-shadow.hlsl
index e1344dd87a6ed..a15c9a7747117 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-shadow.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested-shadow.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 
 struct Inner {
   uint Gid : SV_GroupID;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested.hlsl b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested.hlsl
index cd6f9460bc617..ffd955f8d72d4 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic-struct-nested.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic-struct-nested.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 
 struct Inner {
   uint Gid : SV_GroupID;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.arbitrary.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.arbitrary.hlsl
index f1d13cb70c214..10c7321db3421 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.arbitrary.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.arbitrary.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 
+using namespace hlsl;
+
 // CHECK-SPIRV-DAG:  @AAA0 = external hidden thread_local addrspace(7) externally_initialized constant float, !spirv.Decorations ![[#METADATA_0:]]
 // CHECK-SPIRV-DAG:    @B0 = external hidden thread_local addrspace(7) externally_initialized constant i32, !spirv.Decorations ![[#METADATA_2:]]
 // CHECK-SPIRV-DAG:   @CC0 = external hidden thread_local addrspace(7) externally_initialized constant <2 x float>, !spirv.Decorations ![[#METADATA_4:]]
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.array.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.array.hlsl
index 524c521913a2a..c9b117b720c4f 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.array.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.array.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 // RUN: %clang_cc1 -triple dxil-px-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 
+using namespace hlsl;
+
 struct S0 {
   float4 position[2];
   float4 color;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.array.output.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.array.output.hlsl
index 8a8ba0f52bc1e..0aecafa10d9a4 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.array.output.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.array.output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 // RUN: %clang_cc1 -triple dxil-px-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 
+using namespace hlsl;
+
 struct S0 {
   float4 position[2];
   float4 color;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.explicit-location-output-struct.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.explicit-location-output-struct.hlsl
index 60468b179498b..2c9603cb11a8a 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.explicit-location-output-struct.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.explicit-location-output-struct.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_Position = external hidden thread_local addrspace(7) externally_initialized constant <4 x float>, !spirv.Decorations ![[#MD_0:]]
 // CHECK-SPIRV: @SV_Target0 = external hidden thread_local addrspace(8) global <4 x float>, !spirv.Decorations ![[#MD_2:]]
 
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.explicit-location.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.explicit-location.hlsl
index a6e90b29349b9..ce60ebadf0331 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.explicit-location.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.explicit-location.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-SPIRV
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefix=CHECK-DXIL
 
+using namespace hlsl;
+
 // CHECK-SPIRV: @SV_Target0 = external hidden thread_local addrspace(8) global <4 x float>, !spirv.Decorations ![[#MD_2:]]
 
 // CHECK: define void @main() {{.*}} {
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.hlsl
index 024310ad34d47..e4bad650667c7 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-pixel -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV
 
+using namespace hlsl;
+
 // The following code is allowed because the `SV_Position` semantic is here
 // translated into a SPIR-V builtin. Meaning there is no implicit `Location`
 // assignment.
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.vs.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.vs.hlsl
index fd3bffa849718..69663714c8a83 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix-builtin.vs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-vertex -x hlsl -hlsl-entry main1 -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // This is almost the same as semantic.explicit-mix-builtin.hlsl, except this
 // time we build a vertex shader. This means the SV_Position semantic output
 // is also a BuiltIn, This means we can mix implicit and explicit location
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix.lib.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix.lib.hlsl
index 793241a329548..797f5f13ab46c 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix.lib.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.explicit-mix.lib.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK
 
+using namespace hlsl;
+
 // The followiong file contains both implicit and explicit vk::location, but
 // because each entrypoint has only one kind, this is allowed.
 
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.input.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.input.hlsl
index b17298d8dee24..5f35f22dba843 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.input.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.input.hlsl
@@ -6,6 +6,8 @@
 //
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   float a       : A;
   float4 b      : B;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.matrix.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.matrix.hlsl
index b383d925970ff..dc8447cabc954 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.matrix.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.matrix.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fmatrix-memory-layout=row-major -o - %s | FileCheck %s --check-prefixes=CHECK,ROW
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fmatrix-memory-layout=column-major -o - %s | FileCheck %s --check-prefixes=CHECK,COLUMN
 
+using namespace hlsl;
+
 // Explicit layout overrides the default. A row-major 2x3 matrix occupies two
 // signature rows, but direct arguments and returns are column-major vectors.
 [shader("vertex")]
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.nested.vs.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.nested.vs.hlsl
index ecd92b371f143..62c071e068a7a 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.nested.vs.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.nested.vs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-vertex -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct Inner {
     uint b : B;
 };
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.output.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.output.hlsl
index 67bd7c8f79776..e1becb0a13f5f 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.output.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.output.hlsl
@@ -6,6 +6,8 @@
 //
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   float a       : A;
   float4 b      : B;
diff --git a/clang/test/CodeGenHLSL/semantics/semantic.struct.hlsl b/clang/test/CodeGenHLSL/semantics/semantic.struct.hlsl
index 38a7559712a95..ec8e494d34687 100644
--- a/clang/test/CodeGenHLSL/semantics/semantic.struct.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/semantic.struct.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL -DTARGET=dx
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIRV -DTARGET=spv
 
+using namespace hlsl;
+
 struct S0 {
   uint Idx : SV_DispatchThreadID;
 };
diff --git a/clang/test/CodeGenHLSL/semantics/signature-packing-errors-output.hlsl b/clang/test/CodeGenHLSL/semantics/signature-packing-errors-output.hlsl
index 6f3bd07c7e327..d679c8b386cd0 100644
--- a/clang/test/CodeGenHLSL/semantics/signature-packing-errors-output.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/signature-packing-errors-output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fdx-semantic-signature-packing-mode=prefix-stable -o /dev/null -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fdx-semantic-signature-packing-mode=optimized -o /dev/null -verify %s
 
+using namespace hlsl;
+
 struct Output {
   float4 data[33] : A;
 };
diff --git a/clang/test/CodeGenHLSL/semantics/signature-packing-errors.hlsl b/clang/test/CodeGenHLSL/semantics/signature-packing-errors.hlsl
index 9ff50387de3c2..f29fba5a7b4c4 100644
--- a/clang/test/CodeGenHLSL/semantics/signature-packing-errors.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/signature-packing-errors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fdx-semantic-signature-packing-mode=prefix-stable -o /dev/null -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fdx-semantic-signature-packing-mode=optimized -o /dev/null -verify %s
 
+using namespace hlsl;
+
 [shader("pixel")]
 // expected-error at +1 {{failed to pack input signature: signature elements do not fit in 32 rows (element 0)}}
 void input_overflow(float4 data[33] : A) {}
diff --git a/clang/test/CodeGenHLSL/semantics/signature-packing-warnings.hlsl b/clang/test/CodeGenHLSL/semantics/signature-packing-warnings.hlsl
index 8b0d91b46207c..733b0775edf78 100644
--- a/clang/test/CodeGenHLSL/semantics/signature-packing-warnings.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/signature-packing-warnings.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -emit-llvm -finclude-default-header -disable-llvm-passes -fdx-semantic-signature-packing-mode=optimized -o /dev/null -verify=library %t/library.hlsl
 
 //--- vertex.hlsl
+using namespace hlsl;
+
 // Vertex targets warn about their fixed input layout, including empty inputs.
 [shader("vertex")]
 // vertex-warning at +1 {{semantic signature packing mode 'prefix-stable' is ignored as vertex shader inputs always use stacked packing}}
@@ -21,6 +23,8 @@ float4 vertex_output_only() : SV_Position {
 void vertex_empty() {}
 
 //--- pixel.hlsl
+using namespace hlsl;
+
 // Pixel targets warn about their fixed output layout, including empty outputs.
 [shader("pixel")]
 // pixel-warning at +1 {{semantic signature packing mode 'optimized' is ignored as pixel shader outputs always use indexed packing}}
diff --git a/clang/test/CodeGenHLSL/semantics/signature-packing.hlsl b/clang/test/CodeGenHLSL/semantics/signature-packing.hlsl
index 3f02576a45075..dd071e7976725 100644
--- a/clang/test/CodeGenHLSL/semantics/signature-packing.hlsl
+++ b/clang/test/CodeGenHLSL/semantics/signature-packing.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_dxc -T lib_6_3 -fcgl -pack-prefix-stable %s | FileCheck %s --check-prefixes=CHECK,STABLE
 // RUN: %clang_dxc -T lib_6_3 -fcgl -pack-optimized %s | FileCheck %s --check-prefixes=CHECK,OPTIMIZED
 
+using namespace hlsl;
+
 struct Varyings {
   float a : A;
   float2 b : B;
diff --git a/clang/test/CodeGenHLSL/sgep/array_load.hlsl b/clang/test/CodeGenHLSL/sgep/array_load.hlsl
index db3d5a1580023..f886144eb9b08 100644
--- a/clang/test/CodeGenHLSL/sgep/array_load.hlsl
+++ b/clang/test/CodeGenHLSL/sgep/array_load.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -fexperimental-logical-pointer -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -fexperimental-logical-pointer -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 void foo() {
 // CHECK: %array = call elementtype([3 x i32]) ptr @llvm.structured.alloca.p0()
   uint array[3] = { 0, 1, 2 };
diff --git a/clang/test/CodeGenHLSL/sgep/array_store.hlsl b/clang/test/CodeGenHLSL/sgep/array_store.hlsl
index 886bc49c0019e..3323b99b4dcf5 100644
--- a/clang/test/CodeGenHLSL/sgep/array_store.hlsl
+++ b/clang/test/CodeGenHLSL/sgep/array_store.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -fexperimental-logical-pointer -disable-llvm-passes -o - %s | FileCheck %s
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -fexperimental-logical-pointer -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 [shader("compute")]
 [numthreads(1,1,1)]
 void foo() {
diff --git a/clang/test/CodeGenHLSL/sgep/load_global.hlsl b/clang/test/CodeGenHLSL/sgep/load_global.hlsl
index b35583591fddf..f095d0d47a72c 100644
--- a/clang/test/CodeGenHLSL/sgep/load_global.hlsl
+++ b/clang/test/CodeGenHLSL/sgep/load_global.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -fexperimental-logical-pointer -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK-DXIL
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -fexperimental-logical-pointer -o - %s | FileCheck %s --check-prefixes=CHECK-SPIR
 
+using namespace hlsl;
+
 struct S {
   uint a;
   uint b;
diff --git a/clang/test/CodeGenHLSL/sgep/object_method.hlsl b/clang/test/CodeGenHLSL/sgep/object_method.hlsl
index 34b6c4a44ed65..f5499cdab55d2 100644
--- a/clang/test/CodeGenHLSL/sgep/object_method.hlsl
+++ b/clang/test/CodeGenHLSL/sgep/object_method.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -emit-llvm -finclude-default-header -fexperimental-logical-pointer -disable-llvm-passes -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-DXIL
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -fexperimental-logical-pointer -o - %s | FileCheck %s --check-prefixes=CHECK,CHECK-SPIR
 
+using namespace hlsl;
+
 struct O {
   int value = 0;
 
diff --git a/clang/test/CodeGenHLSL/shift-mask.hlsl b/clang/test/CodeGenHLSL/shift-mask.hlsl
index 41e05330ed1a5..66331d399a14b 100644
--- a/clang/test/CodeGenHLSL/shift-mask.hlsl
+++ b/clang/test/CodeGenHLSL/shift-mask.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s \
 // RUN:   -emit-llvm -disable-llvm-passes -o - | FileCheck %s
 
+using namespace hlsl;
+
 int shl32(int V, int S) {
   return V << S;
 }
diff --git a/clang/test/CodeGenHLSL/static-local-ctor.hlsl b/clang/test/CodeGenHLSL/static-local-ctor.hlsl
index d7637793ec952..cb023a362ba78 100644
--- a/clang/test/CodeGenHLSL/static-local-ctor.hlsl
+++ b/clang/test/CodeGenHLSL/static-local-ctor.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -emit-llvm -o - -disable-llvm-passes %s | \
 // RUN:   llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // Verify that no per variable _Init_thread instructions are emitted for non-trivial static locals
 // These would normally be emitted by the MicrosoftCXXABI, but the DirectX backend should exlude them
 // Instead, check for the guardvar operations that should protect the constructor initialization should
diff --git a/clang/test/CodeGenHLSL/vk-features/SpirvType.alignment.hlsl b/clang/test/CodeGenHLSL/vk-features/SpirvType.alignment.hlsl
index 41cdd7d21bcbe..7935bc518ff9c 100644
--- a/clang/test/CodeGenHLSL/vk-features/SpirvType.alignment.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/SpirvType.alignment.hlsl
@@ -2,6 +2,8 @@
 // RUN:   spirv-unknown-vulkan-compute %s -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s
 
+using namespace hlsl;
+
 using Int = vk::SpirvType</* OpTypeInt */ 21, 4, 64, vk::Literal<vk::integral_constant<uint, 8>>, vk::Literal<vk::integral_constant<bool, false>>>;
 
 // CHECK: %struct.S = type <{ i32, target("spirv.Type", target("spirv.Literal", 8), target("spirv.Literal", 0), 21, 4, 64), [4 x i8] }>
diff --git a/clang/test/CodeGenHLSL/vk-features/SpirvType.hlsl b/clang/test/CodeGenHLSL/vk-features/SpirvType.hlsl
index c733b08f23837..7eb7f381f87a6 100644
--- a/clang/test/CodeGenHLSL/vk-features/SpirvType.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/SpirvType.hlsl
@@ -2,6 +2,8 @@
 // RUN:   spirv-unknown-vulkan-compute %s -emit-llvm -disable-llvm-passes \
 // RUN:   -fspv-use-unknown-image-format -o - | FileCheck %s
 
+using namespace hlsl;
+
 template<class T, uint64_t Size>
 using Array = vk::SpirvOpaqueType</* OpTypeArray */ 28, T, vk::integral_constant<uint64_t, Size>>;
 
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.bitfield.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.bitfield.hlsl
index 412ec4dffc572..f1d158a216f67 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.bitfield.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.bitfield.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   uint32_t a : 1;
   uint32_t b : 1;
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.hlsl
index 890e9a6c1262a..88cb0cbd3c8cf 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.access.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   uint a;
 };
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.anon-struct.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.anon-struct.hlsl
index c5b040adb0193..3d3020b8119a5 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.anon-struct.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.anon-struct.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 [[vk::push_constant]]
 struct {
     int    a;
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.dxil.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.dxil.hlsl
index 47719b5f28e23..5196184dab437 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.dxil.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.dxil.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   uint value;
 };
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.layout.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.layout.hlsl
index c671e6effe3e4..98aafc4b0543e 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.layout.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.layout.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct T {
                  float2   f1[3];
     // FIXME(): matrix support.
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.static.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.static.hlsl
index ca05fda1d0ee1..5f8cab2f3697d 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.static.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.pushconstant.static.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan-compute -x hlsl -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 struct S
 {
   const static uint a = 1;
diff --git a/clang/test/CodeGenHLSL/vk-features/vk.spec-constant.hlsl b/clang/test/CodeGenHLSL/vk-features/vk.spec-constant.hlsl
index ec2ec6463aa9a..de424956f3b7d 100644
--- a/clang/test/CodeGenHLSL/vk-features/vk.spec-constant.hlsl
+++ b/clang/test/CodeGenHLSL/vk-features/vk.spec-constant.hlsl
@@ -3,6 +3,8 @@
 // RUN:   spirv-unknown-vulkan-compute %s -fnative-int16-type -emit-llvm -disable-llvm-passes \
 // RUN:   -o - | FileCheck %s
 
+using namespace hlsl;
+
 [[vk::constant_id(1)]]
 const bool bool_const = true;
 
diff --git a/clang/test/CodeGenHLSL/vk-input-builtin.hlsl b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl
index cbf79738a953f..93ed2ea593350 100644
--- a/clang/test/CodeGenHLSL/vk-input-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/vk-input-builtin.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan1.3-compute %s -emit-llvm -O3 -o - | FileCheck %s
 
+using namespace hlsl;
+
 [[vk::ext_builtin_input(/* WorkgroupId */ 26)]]
 static const uint3 groupid;
 // CHECK: @_ZL7groupid = external hidden local_unnamed_addr addrspace(7) externally_initialized constant <3 x i32>, align 4, !spirv.Decorations [[META0:![0-9]+]]
diff --git a/clang/test/CodeGenHLSL/vk-output-builtin.hlsl b/clang/test/CodeGenHLSL/vk-output-builtin.hlsl
index 3ca2b6c149af8..d5dc36d979e29 100644
--- a/clang/test/CodeGenHLSL/vk-output-builtin.hlsl
+++ b/clang/test/CodeGenHLSL/vk-output-builtin.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan1.3-vertex %s -emit-llvm -O3 -o - | FileCheck %s
 
+using namespace hlsl;
+
 [[vk::ext_builtin_output(/* Position */ 0)]]
 static float4 position;
 // CHECK: @position = external hidden local_unnamed_addr addrspace(8) global <4 x float>, align 4, !spirv.Decorations [[META0:![0-9]+]]
diff --git a/clang/test/CodeGenHLSL/vk_binding_attr.hlsl b/clang/test/CodeGenHLSL/vk_binding_attr.hlsl
index 45955e1327a53..bba35e5d31622 100644
--- a/clang/test/CodeGenHLSL/vk_binding_attr.hlsl
+++ b/clang/test/CodeGenHLSL/vk_binding_attr.hlsl
@@ -8,6 +8,8 @@
 // CHECK: [[Buf5:@.*]] = private unnamed_addr constant [5 x i8] c"Buf5\00"
 // CHECK: [[Buf6:@.*]] = private unnamed_addr constant [5 x i8] c"Buf6\00"
 
+using namespace hlsl;
+
 [[vk::binding(23, 102)]] StructuredBuffer<float> Buf;
 [[vk::binding(14, 1)]] StructuredBuffer<float> Buf2 : register(t23, space102);
 [[vk::binding(14)]] StructuredBuffer<float> Buf3 : register(t23, space102);
diff --git a/clang/test/Driver/dxc_rootsig-define.hlsl b/clang/test/Driver/dxc_rootsig-define.hlsl
index 40c3e127f94d5..e96b146895d11 100644
--- a/clang/test/Driver/dxc_rootsig-define.hlsl
+++ b/clang/test/Driver/dxc_rootsig-define.hlsl
@@ -14,6 +14,8 @@
 // RUN:  -fdx-rootsignature-define=CmdRS -D CmdRS='"SRV(t0)"' \
 // RUN:  | FileCheck %s --check-prefixes=CHECK,CMD
 
+using namespace hlsl;
+
 #define EmptyRS ""
 #define NotEmptyRS "CBV(b0)"
 
diff --git a/clang/test/ParserHLSL/hlsl_annotations_on_struct_members.hlsl b/clang/test/ParserHLSL/hlsl_annotations_on_struct_members.hlsl
index a52c01d772a72..0781ee7d58672 100644
--- a/clang/test/ParserHLSL/hlsl_annotations_on_struct_members.hlsl
+++ b/clang/test/ParserHLSL/hlsl_annotations_on_struct_members.hlsl
@@ -1,11 +1,13 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // tests that hlsl annotations are properly parsed when applied on field decls,
 // and that the annotation gets properly placed on the AST.
 
 struct Eg9{
   // CHECK: CXXRecordDecl 0x{{[0-9a-f]+}} <col:1, col:8> col:8 implicit struct Eg9
-  // CHECK: FieldDecl 0x{{[0-9a-f]+}} <line:10:3, col:16> col:16 referenced a 'unsigned int'
+  // CHECK: FieldDecl 0x{{[0-9a-f]+}} <line:12:3, col:16> col:16 referenced a 'unsigned int'
   // CHECK: -HLSLParsedSemanticAttr 0x{{[0-9a-f]+}} <col:20> "SV_DispatchThreadID" 0
   unsigned int a : SV_DispatchThreadID;
 };
diff --git a/clang/test/ParserHLSL/hlsl_contained_type_attr.hlsl b/clang/test/ParserHLSL/hlsl_contained_type_attr.hlsl
index cf7f9510f1abb..12de4114a2e4b 100644
--- a/clang/test/ParserHLSL/hlsl_contained_type_attr.hlsl
+++ b/clang/test/ParserHLSL/hlsl_contained_type_attr.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl202x -x hlsl -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 typedef vector<float, 4> float4;
 
 // CHECK: -TypeAliasDecl 0x{{[0-9a-f]+}} <line:[[# @LINE + 4]]:1, col:85>
diff --git a/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl b/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
index 5fd7c6dd77fab..6f1b11a465fd5 100644
--- a/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
+++ b/clang/test/ParserHLSL/hlsl_resource_handle_attrs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK: ClassTemplateSpecializationDecl {{.*}} class RWBuffer definition external-linkage instantiated_from 0x{{.+}} implicit_instantiation
 // CHECK: TemplateArgument type 'float'
 // CHECK: BuiltinType {{.*}} 'float'
diff --git a/clang/test/SemaHLSL/Attributes/hlsl_contained_type_attr_error.hlsl b/clang/test/SemaHLSL/Attributes/hlsl_contained_type_attr_error.hlsl
index d27280490bffe..8aacf4b864407 100644
--- a/clang/test/SemaHLSL/Attributes/hlsl_contained_type_attr_error.hlsl
+++ b/clang/test/SemaHLSL/Attributes/hlsl_contained_type_attr_error.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl202x -x hlsl -o - %s -verify
 
+using namespace hlsl;
+
 typedef vector<float, 4> float4;
 
 // expected-error at +1{{'hlsl::contained_type' attribute cannot be applied to a declaration}}
diff --git a/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl
index 553db49231ae0..da75c07669375 100644
--- a/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/AddUint64-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint2 test_too_few_arg() {
   return __builtin_hlsl_adduint64();
   // expected-error at -1 {{too few arguments to function call, expected 2, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-availability.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-availability.hlsl
index e3e235028733f..e4783d9f1f3d2 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-availability.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-availability.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.7-library %s -fhlsl-strict-availability \
 // RUN:   -fsyntax-only -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 
 void test_availability() {
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-context-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-context-errors.hlsl
index 43ee86bd2aaa1..0d78ab3c246ca 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-context-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-context-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.8-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 
 export void invalid_scope_combinations() {
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-context.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-context.hlsl
index 110970630b371..f24d30ab339ef 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-context.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-context.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.8-library %s -fsyntax-only -verify
 // expected-no-diagnostics
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 
 [shader("vertex")]
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-errors.hlsl
index c6cac6f0ca60c..b9661f7013d9f 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.8-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 Buffer<float> ReadOnlyBuffer;
 
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-spirv.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-spirv.hlsl
index 109c66758079a..5265d2a88809e 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-spirv.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-spirv.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple \
 // RUN:   spirv-unknown-vulkan-library %s -emit-llvm-only -verify
 
+using namespace hlsl;
+
 RWBuffer<float> UAVBuffer;
 
 void test_spirv() {
diff --git a/clang/test/SemaHLSL/BuiltIns/Barrier-strict-availability-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/Barrier-strict-availability-errors.hlsl
index 349d02bbabe01..2a65f1c38cd19 100644
--- a/clang/test/SemaHLSL/BuiltIns/Barrier-strict-availability-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Barrier-strict-availability-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   dxil-pc-shadermodel6.8-compute -hlsl-entry main \
 // RUN:   -fhlsl-strict-availability -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 void barrier_helper() {
   // expected-error at +1 {{GROUP_SCOPE requires a nonzero MemoryTypeFlags argument}}
   Barrier(0, GROUP_SCOPE);
diff --git a/clang/test/SemaHLSL/BuiltIns/Buffers-Load-const.hlsl b/clang/test/SemaHLSL/BuiltIns/Buffers-Load-const.hlsl
index 3b2fa7c05440e..0975160ee5059 100644
--- a/clang/test/SemaHLSL/BuiltIns/Buffers-Load-const.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Buffers-Load-const.hlsl
@@ -11,6 +11,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.0-compute -x hlsl -fsyntax-only -verify \
 // RUN:   "-DRESOURCE=RWBuffer<uint>" -DREGISTER=u1 %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Regression test for https://github.com/llvm/llvm-project/issues/192557
diff --git a/clang/test/SemaHLSL/BuiltIns/Buffers.hlsl b/clang/test/SemaHLSL/BuiltIns/Buffers.hlsl
index db4a6746f6fb3..757c497e3ec17 100644
--- a/clang/test/SemaHLSL/BuiltIns/Buffers.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/Buffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -Wno-hlsl-implicit-binding -triple dxil-pc-shadermodel6.0-compute -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 typedef vector<float, 3> float3;
 typedef vector<double, 2> double2;
 typedef vector<double, 3> double3;
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-errors.hlsl
index f63e64b9f5837..25a397fe32b02 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note,warning
 
+using namespace hlsl;
+
 // notes that are ignored are strictly ones of the form:
 // (frontend): candidate function not viable: requires X arguments, but Y was provided
 // or
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-sm65-errors.hlsl
index e6210ba36e357..9397a1feab41f 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAdd-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAnd-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAnd-sm65-errors.hlsl
index 9ccc7fb1168c4..559a5d90ca32a 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAnd-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedAnd-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchange-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchange-sm65-errors.hlsl
index cdb6a8c9969bf..36c0359a551f8 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchange-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchange-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchangeFloatBitwise-sm60.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchangeFloatBitwise-sm60.hlsl
index 2adc6d1e1e552..98659e522329e 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchangeFloatBitwise-sm60.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareExchangeFloatBitwise-sm60.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.0-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 // The float-bitwise compare reuses the 32-bit integer DXIL operation, so it
 // needs no capability bits and works from SM 6.0. The 64-bit compare-exchange
 // needs SM 6.6. This file checks both halves, so it proves the two are gated
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStore-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStore-sm65-errors.hlsl
index ff4a438e64d21..908fa74b384ad 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStore-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStore-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStoreFloatBitwise-sm60.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStoreFloatBitwise-sm60.hlsl
index 5954884163670..947765d26dce9 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStoreFloatBitwise-sm60.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedCompareStoreFloatBitwise-sm60.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.0-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 // The float-bitwise compare reuses the 32-bit integer DXIL operation, so it
 // needs no capability bits and works from SM 6.0. The 64-bit compare-store
 // needs SM 6.6. This file checks both halves, so it proves the two are gated
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-errors.hlsl
index ba76e493bfc09..9a7f4f363d2ba 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note,warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-sm65-errors.hlsl
index 3205f156827fa..dcff676776f59 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchange-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchangeFloat-sm60.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchangeFloat-sm60.hlsl
index c4b1f34455f14..83fe7dfbf6717 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchangeFloat-sm60.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedExchangeFloat-sm60.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.0-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 // The float exchange reuses the 32-bit integer DXIL operation, so it needs no
 // capability bits and works from SM 6.0. The 64-bit exchange needs SM 6.6.
 // This file checks both halves, so it proves the two are gated differently.
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-errors.hlsl
index 2ec7cc6e69ba4..b2344c4b289e4 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note,warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-sm65-errors.hlsl
index 4694d81e5b24b..310894539a0d2 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMax-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-errors.hlsl
index b3744d500c6b3..f6653badd2c28 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=note,warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-sm65-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-sm65-errors.hlsl
index b30c7c6967fbb..c6826c4b21f5f 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-sm65-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffer-InterlockedMin-sm65-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.5-library %s -fsyntax-only -verify \
 // RUN:   -verify-ignore-unexpected=warning
 
+using namespace hlsl;
+
 RWByteAddressBuffer BAB : register(u0);
 RasterizerOrderedByteAddressBuffer ROVB : register(u1);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffers.hlsl b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffers.hlsl
index bd5759ddc0f04..98526a8378f72 100644
--- a/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffers.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ByteAddressBuffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 ByteAddressBuffer Buf : register(t0);
 RWByteAddressBuffer RWBuf : register(u0);
 
diff --git a/clang/test/SemaHLSL/BuiltIns/ConstantBuffer-member-funcs.hlsl b/clang/test/SemaHLSL/BuiltIns/ConstantBuffer-member-funcs.hlsl
index a5d8862294cf6..60ee27e9f9de8 100644
--- a/clang/test/SemaHLSL/BuiltIns/ConstantBuffer-member-funcs.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ConstantBuffer-member-funcs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 struct S {
     float a;
     
diff --git a/clang/test/SemaHLSL/BuiltIns/D3DCOLORtoUBYTE4-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/D3DCOLORtoUBYTE4-errors.hlsl
index a970885b9821d..17807bd15d1aa 100644
--- a/clang/test/SemaHLSL/BuiltIns/D3DCOLORtoUBYTE4-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/D3DCOLORtoUBYTE4-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int4 test_too_few_arg() {
   return D3DCOLORtoUBYTE4();
   // expected-error at -1 {{no matching function for call to 'D3DCOLORtoUBYTE4'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedAdd-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedAdd-errors.hlsl
index 5e779d3a484f5..37da44b2f2ec7 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedAdd-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedAdd-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedAdd is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg). Invalid
 // calls surface as "no matching function" with 16 candidates. The candidate
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedAnd-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedAnd-errors.hlsl
index c249f44fe3528..ced2532a8a8a5 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedAnd-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedAnd-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedAnd is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg).
 
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchange-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchange-errors.hlsl
index 7aeb2c7ac4500..1d322ec0e0859 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchange-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchange-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedCompareExchange is provided as a set of address-space-qualified
 // overloads (groupshared/device, {int,uint,int64_t,uint64_t}). It reports the
 // value that was in the destination, so it has a single 4-argument form with a
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchangeFloatBitwise-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchangeFloatBitwise-errors.hlsl
index 934654c5f366d..5b5b67c58098f 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchangeFloatBitwise-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareExchangeFloatBitwise-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedCompareExchangeFloatBitwise compares the bit pattern of a 32-bit
 // float, so it is provided as a float-only overload set (groupshared/device).
 // It reports the previous value, so it has a single 4-argument form.
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStore-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStore-errors.hlsl
index ea3b82fe9f42f..2dc0ec33a4c4b 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStore-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStore-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedCompareStore is provided as a set of address-space-qualified
 // overloads (groupshared/device, {int,uint,int64_t,uint64_t}). It reports
 // nothing, so it has a single 3-argument form and no out parameter.
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStoreFloatBitwise-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStoreFloatBitwise-errors.hlsl
index f291c6264f099..81318d22d21c3 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStoreFloatBitwise-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedCompareStoreFloatBitwise-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedCompareStoreFloatBitwise compares the bit pattern of a 32-bit
 // float, so it is provided as a float-only overload set (groupshared/device).
 // It reports nothing, so it has a single 3-argument form and no out parameter.
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedExchange-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedExchange-errors.hlsl
index 2eb464ca50260..1a0af2eca90b2 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedExchange-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedExchange-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedExchange is provided as a set of address-space-qualified
 // overloads (groupshared/device, {int,uint,int64_t,uint64_t,float}). It always
 // reports the previous value, so there is no 2-argument form. Only 32-bit
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedMax-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedMax-errors.hlsl
index 938841ec162a0..88cfdb9179653 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedMax-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedMax-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedMax is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg).
 
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedMin-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedMin-errors.hlsl
index 99c5311e44fcd..ef8b96662303d 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedMin-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedMin-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedMin is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg).
 
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedOr-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedOr-errors.hlsl
index ddc5e6ba45343..6b8c39102c477 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedOr-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedOr-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedOr is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg). All arg
 // mismatches surface as "no matching function" with 16 candidates. The
diff --git a/clang/test/SemaHLSL/BuiltIns/InterlockedXor-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/InterlockedXor-errors.hlsl
index 9c47f52c1cdec..6147baca202c2 100644
--- a/clang/test/SemaHLSL/BuiltIns/InterlockedXor-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/InterlockedXor-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // InterlockedXor is provided as a set of address-space-qualified overloads
 // (groupshared/device, {int,uint,int64_t,uint64_t}, 2-arg/3-arg). All arg
 // mismatches surface as "no matching function" with 16 candidates. The
diff --git a/clang/test/SemaHLSL/BuiltIns/QuadAll-availability.hlsl b/clang/test/SemaHLSL/BuiltIns/QuadAll-availability.hlsl
index c6b3bea64e760..b7820e9c7cffb 100644
--- a/clang/test/SemaHLSL/BuiltIns/QuadAll-availability.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/QuadAll-availability.hlsl
@@ -5,6 +5,8 @@
 // RUN:   dxil-pc-shadermodel6.7-library %s -fhlsl-strict-availability \
 // RUN:   -fsyntax-only -verify=sm67
 
+using namespace hlsl;
+
 // sm67-no-diagnostics
 
 bool test_availability(bool cond) {
diff --git a/clang/test/SemaHLSL/BuiltIns/QuadAll-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/QuadAll-errors.hlsl
index b12ca49e1e432..80b36c332d951 100644
--- a/clang/test/SemaHLSL/BuiltIns/QuadAll-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/QuadAll-errors.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple \
 // RUN:   spirv-pc-vulkan-library %s -fsyntax-only -verify
 
+using namespace hlsl;
+
 bool test_too_few_args() {
   return __builtin_hlsl_quad_all();
   // expected-error at -1 {{too few arguments to function call, expected 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossDiagonal-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossDiagonal-errors.hlsl
index 322eacd7ca798..f85909cf2ba1b 100644
--- a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossDiagonal-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossDiagonal-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_quad_read_across_diagonal();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossX-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossX-errors.hlsl
index c3fb0628aca1f..0044676350938 100644
--- a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossX-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossX-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_quad_read_across_x();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossY-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossY-errors.hlsl
index 27674464dd485..f5157c8ebf35f 100644
--- a/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossY-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/QuadReadAcrossY-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_quad_read_across_y();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl b/clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl
index a767743a0eccc..a2e3babecc566 100644
--- a/clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/RWBuffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 typedef vector<float, 3> float3;
 typedef vector<double, 2> double2;
 typedef vector<double, 3> double3;
diff --git a/clang/test/SemaHLSL/BuiltIns/RWStructuredBuffers.hlsl b/clang/test/SemaHLSL/BuiltIns/RWStructuredBuffers.hlsl
index 30c04937f28e3..b9c4e39d0cef3 100644
--- a/clang/test/SemaHLSL/BuiltIns/RWStructuredBuffers.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/RWStructuredBuffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 typedef vector<float, 3> float3;
 
 RWStructuredBuffer<float3> Buff;
diff --git a/clang/test/SemaHLSL/BuiltIns/StructuredBuffers.hlsl b/clang/test/SemaHLSL/BuiltIns/StructuredBuffers.hlsl
index c9841fbd4c23b..fea6fe4c3ecf0 100644
--- a/clang/test/SemaHLSL/BuiltIns/StructuredBuffers.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/StructuredBuffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 typedef vector<float, 3> float3;
 
 StructuredBuffer<float3> Buff;
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveAllEqual-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveAllEqual-errors.hlsl
index 1b5d7955baffc..fc32efa9f7e8e 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveAllEqual-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveAllEqual-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool test_too_few_arg() {
   return __builtin_hlsl_wave_active_all_equal();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveBallot-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveBallot-errors.hlsl
index 802226a935596..9091e8cbd7a64 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveBallot-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveBallot-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint4 test_too_few_arg() {
   return __builtin_hlsl_wave_active_ballot();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveBitOr-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveBitOr-errors.hlsl
index 5df1c7288045f..48b30996c6057 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveBitOr-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveBitOr-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint test_too_few_arg() {
   return __builtin_hlsl_wave_active_bit_or();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveMax-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveMax-errors.hlsl
index e077a40ba5165..3063a7f910424 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveMax-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveMax-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_active_max();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveMin.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveMin.hlsl
index 3b12faf8d9978..8e564ba27f584 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveMin.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveMin.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_active_min();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveProduct-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveProduct-errors.hlsl
index 43ad02b35fc1c..a31c68e55c7a2 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveProduct-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveProduct-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_active_product();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveActiveSum-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveActiveSum-errors.hlsl
index 406e8fc57ca95..58d1de602b7c7 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveActiveSum-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveActiveSum-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_active_sum();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitAnd-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitAnd-errors.hlsl
index e474bb81a7801..f0161d5d9ff13 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitAnd-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitAnd-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_AVAILABILITY \
 // RUN:   -triple dxil-pc-shadermodel6.4-library -verify=availability %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitOr-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitOr-errors.hlsl
index 274794aa812f2..c9e533d71f96b 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitOr-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitOr-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_AVAILABILITY \
 // RUN:   -triple dxil-pc-shadermodel6.4-library -verify=availability %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitXor-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitXor-errors.hlsl
index e05182f17cfaa..4e1fcb81456d0 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitXor-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixBitXor-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_AVAILABILITY \
 // RUN:   -triple dxil-pc-shadermodel6.4-library -verify=availability %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixCountBits-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixCountBits-errors.hlsl
index 4b0944d349395..ccacbc1aa8ccd 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixCountBits-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixCountBits-errors.hlsl
@@ -5,6 +5,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_UNSUPPORTED \
 // RUN:   -triple spirv-pc-vulkan-library -verify=spirv %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixProduct-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixProduct-errors.hlsl
index 03075690f16c0..813aa55bc499f 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixProduct-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixProduct-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_AVAILABILITY \
 // RUN:   -triple dxil-pc-shadermodel6.4-library -verify=availability %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixSum-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixSum-errors.hlsl
index 66319f492536c..f58cf549ce252 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixSum-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveMultiPrefixSum-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -finclude-default-header -DTEST_AVAILABILITY \
 // RUN:   -triple dxil-pc-shadermodel6.4-library -verify=availability %s
 
+using namespace hlsl;
+
 #ifdef TEST_AVAILABILITY
 [shader("compute")]
 [numthreads(1, 1, 1)]
diff --git a/clang/test/SemaHLSL/BuiltIns/WavePrefixCountBits-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WavePrefixCountBits-errors.hlsl
index a3d7cc2c3d527..da5a1f9bb6208 100644
--- a/clang/test/SemaHLSL/BuiltIns/WavePrefixCountBits-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WavePrefixCountBits-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -fmath-errno -ffp-contract=on -fno-rounding-math -finclude-default-header \
 // RUN:   -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_prefix_count_bits();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WavePrefixProduct-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WavePrefixProduct-errors.hlsl
index 7fd44b2705b5a..97fa7dc5cda51 100644
--- a/clang/test/SemaHLSL/BuiltIns/WavePrefixProduct-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WavePrefixProduct-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_prefix_product();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WavePrefixSum-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WavePrefixSum-errors.hlsl
index 1e575c94e67a5..67807c98b6d52 100644
--- a/clang/test/SemaHLSL/BuiltIns/WavePrefixSum-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WavePrefixSum-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return __builtin_hlsl_wave_prefix_sum();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveReadLaneAt-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveReadLaneAt-errors.hlsl
index ef8299b59ca73..7c6de923dcfa3 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveReadLaneAt-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveReadLaneAt-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool test_too_few_arg() {
   return __builtin_hlsl_wave_read_lane_at();
   // expected-error at -1 {{too few arguments to function call, expected 2, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/WaveReadLaneFirst-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/WaveReadLaneFirst-errors.hlsl
index 19e5fdadc276d..42251e4681a99 100644
--- a/clang/test/SemaHLSL/BuiltIns/WaveReadLaneFirst-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/WaveReadLaneFirst-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool test_too_few_arg() {
   return __builtin_hlsl_wave_read_lane_first();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/abs_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/abs_mat-errors.hlsl
index 3b496d5558f7c..d9d9e669497d6 100644
--- a/clang/test/SemaHLSL/BuiltIns/abs_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/abs_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float2x2 test_too_few_arg() {
   return __builtin_elementwise_abs();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/asdouble-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asdouble-errors.hlsl
index f658c335b9582..a84616cf96c3d 100644
--- a/clang/test/SemaHLSL/BuiltIns/asdouble-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asdouble-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 double test_too_few_arg() {
   return __builtin_hlsl_asdouble();
   // expected-error at -1 {{too few arguments to function call, expected 2, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
index e342e15855c6b..0b1bbba2c98a7 100644
--- a/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asfloat-constexpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library -fexperimental-new-constant-interpreter %s -verify
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Because asfloat should be constant evaluated, all the static asserts below
diff --git a/clang/test/SemaHLSL/BuiltIns/asfloat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asfloat-errors.hlsl
index 430fff8f38284..b8a20b998b0e0 100644
--- a/clang/test/SemaHLSL/BuiltIns/asfloat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asfloat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 float4 test_float_too_many_arg(float p0, float p1) {
   return asfloat(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/asfloat_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asfloat_mat-errors.hlsl
index 049bf0ecd7424..9de8a2d38f76a 100644
--- a/clang/test/SemaHLSL/BuiltIns/asfloat_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asfloat_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 float4x4 test_float_too_many_arg(float4x4 p0, float4x4 p1) {
   return asfloat(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/asint-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asint-errors.hlsl
index 481c2bbaaa1aa..5c21926582a13 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 int4 test_asint_too_many_arg(float p0, float p1) {
   return asint(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
index 5f3d5c9772d84..9239a978ce4dd 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint16-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.2-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 int16_t4 test_asint16_too_many_arg(uint16_t p0, uint16_t p1)
 {
diff --git a/clang/test/SemaHLSL/BuiltIns/asint_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asint_mat-errors.hlsl
index bdeb142f1815c..6d27e79719449 100644
--- a/clang/test/SemaHLSL/BuiltIns/asint_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asint_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 int4x4 test_float_too_many_arg(float4x4 p0, float4x4 p1) {
   return asint(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl b/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
index a480e41d81794..c783612f7a2f2 100644
--- a/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asuint-constexpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library -fexperimental-new-constant-interpreter %s -verify
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Because asuint should be constant evaluated, all the static asserts below
diff --git a/clang/test/SemaHLSL/BuiltIns/asuint-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asuint-errors.hlsl
index 27d23ddd1688f..99ff31c3491ab 100644
--- a/clang/test/SemaHLSL/BuiltIns/asuint-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asuint-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 uint4 test_asuint_too_many_arg(float p0, float p1) {
   return asuint(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/asuint16-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asuint16-errors.hlsl
index 709d2067d9df2..04b668f8b2b8f 100644
--- a/clang/test/SemaHLSL/BuiltIns/asuint16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asuint16-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.2-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 uint16_t test_asuint16_less_argument()
 {
     return asuint16();
diff --git a/clang/test/SemaHLSL/BuiltIns/asuint_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/asuint_mat-errors.hlsl
index ccff93631417e..2e0c751803356 100644
--- a/clang/test/SemaHLSL/BuiltIns/asuint_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/asuint_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 uint4x4 test_float_too_many_arg(float4x4 p0, float4x4 p1) {
   return asuint(p0, p1);
diff --git a/clang/test/SemaHLSL/BuiltIns/atan2_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/atan2_mat-errors.hlsl
index 78690f74388ad..cf49190374fd8 100644
--- a/clang/test/SemaHLSL/BuiltIns/atan2_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/atan2_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float2x2 test_too_few_arg(float2x2 p0) {
   return __builtin_elementwise_atan2(p0);
   // expected-error at -1 {{too few arguments to function call, expected 2, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/binary-compat-overload-warnings.hlsl b/clang/test/SemaHLSL/BuiltIns/binary-compat-overload-warnings.hlsl
index d521e7f7dd5c0..ff0a744db52c3 100644
--- a/clang/test/SemaHLSL/BuiltIns/binary-compat-overload-warnings.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/binary-compat-overload-warnings.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes -DFUNC=pow %s 2>&1 | FileCheck %s -DFUNC=pow --check-prefixes=CHECK,CHECK-MAT
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes -DFUNC=step %s 2>&1 | FileCheck %s -DFUNC=step
 
+using namespace hlsl;
+
 // binary double overloads
 float test_binary_double(double p0) {
   // CHECK: warning: '[[FUNC]]' is deprecated: In 202x 64 bit API lowering for [[FUNC]] is deprecated. Explicitly cast parameters to 32 or 16 bit types.
diff --git a/clang/test/SemaHLSL/BuiltIns/clamp-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/clamp-errors.hlsl
index f01e14d526c3f..10e2c96ae1e0e 100644
--- a/clang/test/SemaHLSL/BuiltIns/clamp-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/clamp-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 float2 test_no_second_arg(float2 p0) {
   return __builtin_hlsl_elementwise_clamp(p0);
   // expected-error at -1 {{too few arguments to function call, expected 3, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/clip-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/clip-errors.hlsl
index f47468897312c..b79c0d3034483 100644
--- a/clang/test/SemaHLSL/BuiltIns/clip-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/clip-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 
 void test_arg_missing() {
   __builtin_hlsl_elementwise_clip();
diff --git a/clang/test/SemaHLSL/BuiltIns/countbits-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/countbits-errors.hlsl
index 8949324ec69f6..26e127e90eb1c 100644
--- a/clang/test/SemaHLSL/BuiltIns/countbits-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/countbits-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected
 
+using namespace hlsl;
+
 
 double test_int_builtin(double p0) {
   return countbits(p0);
diff --git a/clang/test/SemaHLSL/BuiltIns/cross-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/cross-errors.hlsl
index 04300fd95063d..dd0ed54935147 100644
--- a/clang/test/SemaHLSL/BuiltIns/cross-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/cross-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 void test_too_few_arg()
 {
   return cross();
diff --git a/clang/test/SemaHLSL/BuiltIns/distance-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/distance-errors.hlsl
index 6c9548d9d1c7e..53a56b68ac20e 100644
--- a/clang/test/SemaHLSL/BuiltIns/distance-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/distance-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_no_second_arg(float2 p0) {
   return distance(p0);
   // expected-error at -1 {{no matching function for call to 'distance'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/dot-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/dot-errors.hlsl
index 0f62ba3dbdbf1..cf07b0b743e9d 100644
--- a/clang/test/SemaHLSL/BuiltIns/dot-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/dot-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 float test_no_second_arg(float2 p0) {
   return __builtin_hlsl_dot(p0);
   // expected-error at -1 {{too few arguments to function call, expected 2, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/dot2add-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/dot2add-errors.hlsl
index e576f73669002..0d209202418b1 100644
--- a/clang/test/SemaHLSL/BuiltIns/dot2add-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/dot2add-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_too_few_arg() {
   return dot2add();
   // expected-error at -1 {{no matching function for call to 'dot2add'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/dot4add_u8packed-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/dot4add_u8packed-errors.hlsl
index cc6441cc88be3..bfea4e09d09d6 100644
--- a/clang/test/SemaHLSL/BuiltIns/dot4add_u8packed-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/dot4add_u8packed-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int test_too_few_arg0() {
   return __builtin_hlsl_dot4add_u8packed();
   // expected-error at -1 {{too few arguments to function call, expected 3, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/exp-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/exp-errors.hlsl
index f0076ac4e5881..ce32746daa991 100644
--- a/clang/test/SemaHLSL/BuiltIns/exp-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/exp-errors.hlsl
@@ -1,4 +1,6 @@
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected -DTEST_FUNC=__builtin_elementwise_exp
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected -DTEST_FUNC=__builtin_elementwise_exp2
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected -DTEST_FUNC=__builtin_elementwise_exp10
diff --git a/clang/test/SemaHLSL/BuiltIns/f16tof32-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/f16tof32-errors.hlsl
index 7052ee420c1a3..eed2809e5f896 100644
--- a/clang/test/SemaHLSL/BuiltIns/f16tof32-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/f16tof32-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.6-library %s -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float builtin_f16tof32_too_few_arg() {
   return __builtin_hlsl_elementwise_f16tof32();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/f32tof16-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/f32tof16-errors.hlsl
index b922a1f8f5cd6..8b24646ca91c7 100644
--- a/clang/test/SemaHLSL/BuiltIns/f32tof16-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/f32tof16-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.6-library %s -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint builtin_f32tof16_too_few_arg() {
   return __builtin_hlsl_elementwise_f32tof16();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/faceforward-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/faceforward-errors.hlsl
index 658d1d3426c10..c3ad1faa98943 100644
--- a/clang/test/SemaHLSL/BuiltIns/faceforward-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/faceforward-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_double_inputs(double p0, double p1, double p2) {
   return faceforward(p0, p1, p2);
   // expected-error at -1  {{call to 'faceforward' is ambiguous}}
diff --git a/clang/test/SemaHLSL/BuiltIns/firstbithigh-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/firstbithigh-errors.hlsl
index 1f70186c78ad9..334960ee38343 100644
--- a/clang/test/SemaHLSL/BuiltIns/firstbithigh-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/firstbithigh-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return firstbithigh();
   // expected-error at -1 {{no matching function for call to 'firstbithigh'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/firstbitlow-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/firstbitlow-errors.hlsl
index 37090796577fc..427ff06042272 100644
--- a/clang/test/SemaHLSL/BuiltIns/firstbitlow-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/firstbitlow-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected
 
+using namespace hlsl;
+
 int test_too_few_arg() {
   return firstbitlow();
   // expected-error at -1 {{no matching function for call to 'firstbitlow'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/fma-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/fma-errors.hlsl
index 34e7d1646c765..48080e5370f5c 100644
--- a/clang/test/SemaHLSL/BuiltIns/fma-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/fma-errors.hlsl
@@ -7,6 +7,8 @@
 // RUN:   -emit-llvm-only -disable-llvm-passes -verify \
 // RUN:   -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 float bad_float(float a, float b, float c) {
   // Overload resolution selects 'double fma(double, double, double)'; args promoted to double.
   return fma(a, b, c);
diff --git a/clang/test/SemaHLSL/BuiltIns/fmod-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/fmod-errors.hlsl
index dc1039b1cd831..5afbf8e9b4576 100644
--- a/clang/test/SemaHLSL/BuiltIns/fmod-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/fmod-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_no_second_arg(float2 p0) {
   return fmod(p0);
   // expected-error at -1 {{no matching function for call to 'fmod'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/frac-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/frac-errors.hlsl
index cdf2b61c45207..36fe460c224f7 100644
--- a/clang/test/SemaHLSL/BuiltIns/frac-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/frac-errors.hlsl
@@ -1,4 +1,6 @@
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
 float test_too_few_arg() {
diff --git a/clang/test/SemaHLSL/BuiltIns/geometric-long-vector.hlsl b/clang/test/SemaHLSL/BuiltIns/geometric-long-vector.hlsl
index 73009e8911f39..31b996a9c3612 100644
--- a/clang/test/SemaHLSL/BuiltIns/geometric-long-vector.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/geometric-long-vector.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fsyntax-only -verify
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-unknown-vulkan-library %s -fnative-half-type -fsyntax-only -verify
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 void test_long_vector_types(vector<half, 5> H, vector<float, 5> F) {
diff --git a/clang/test/SemaHLSL/BuiltIns/half-float-only-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/half-float-only-errors.hlsl
index fcf0711bf6965..15dcdb7b1c7e7 100644
--- a/clang/test/SemaHLSL/BuiltIns/half-float-only-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/half-float-only-errors.hlsl
@@ -19,6 +19,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -DTEST_FUNC=__builtin_elementwise_tanh
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -DTEST_FUNC=__builtin_elementwise_trunc
 
+using namespace hlsl;
+
 double test_double_builtin(double p0) {
     return TEST_FUNC(p0);
   // expected-error at -1 {{1st argument must be a scalar or vector of 16 or 32 bit floating-point types (was 'double')}}
diff --git a/clang/test/SemaHLSL/BuiltIns/half-float-only-errors2.hlsl b/clang/test/SemaHLSL/BuiltIns/half-float-only-errors2.hlsl
index e9150aba03cc2..2ace464f462a4 100644
--- a/clang/test/SemaHLSL/BuiltIns/half-float-only-errors2.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/half-float-only-errors2.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -DTEST_FUNC=__builtin_elementwise_fmod
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -DTEST_FUNC=__builtin_elementwise_pow
 
+using namespace hlsl;
+
 double test_double_builtin(double p0, double p1) {
     return TEST_FUNC(p0, p1);
   // expected-error at -1 {{1st argument must be a scalar or vector of 16 or 32 bit floating-point types (was 'double')}}
diff --git a/clang/test/SemaHLSL/BuiltIns/isfinite-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isfinite-errors.hlsl
index 29bc17e4fc10c..d349c17a2070b 100644
--- a/clang/test/SemaHLSL/BuiltIns/isfinite-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isfinite-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool test_too_few_arg() {
   return __builtin_hlsl_elementwise_isfinite();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/isfinite_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isfinite_mat-errors.hlsl
index b95281459bf1c..136d434f84020 100644
--- a/clang/test/SemaHLSL/BuiltIns/isfinite_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isfinite_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool2x2 test_too_few_arg() {
   return __builtin_hlsl_elementwise_isfinite();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/isinf-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isinf-errors.hlsl
index 7ffc750f2d941..35e54e2c9cc5e 100644
--- a/clang/test/SemaHLSL/BuiltIns/isinf-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isinf-errors.hlsl
@@ -1,4 +1,6 @@
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
 bool test_too_few_arg() {
diff --git a/clang/test/SemaHLSL/BuiltIns/isinf_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isinf_mat-errors.hlsl
index 18d7df3280bbf..cf45740f55787 100644
--- a/clang/test/SemaHLSL/BuiltIns/isinf_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isinf_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool2x2 test_too_few_arg() {
   return __builtin_hlsl_elementwise_isinf();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/isnan-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isnan-errors.hlsl
index 1af44ec2dd38f..1277ca2b6280e 100644
--- a/clang/test/SemaHLSL/BuiltIns/isnan-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isnan-errors.hlsl
@@ -1,4 +1,6 @@
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
 bool test_too_few_arg() {
diff --git a/clang/test/SemaHLSL/BuiltIns/isnan_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/isnan_mat-errors.hlsl
index fbcb50422ec3e..444c1d89d114d 100644
--- a/clang/test/SemaHLSL/BuiltIns/isnan_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/isnan_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 bool2x2 test_too_few_arg() {
   return __builtin_hlsl_elementwise_isnan();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/ldexp-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/ldexp-errors.hlsl
index e269918d85938..0a6e5613ff001 100644
--- a/clang/test/SemaHLSL/BuiltIns/ldexp-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ldexp-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_double_inputs(double p0, double p1) {
   return ldexp(p0, p1);
   // expected-error at -1  {{call to 'ldexp' is ambiguous}}
diff --git a/clang/test/SemaHLSL/BuiltIns/length-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/length-errors.hlsl
index 7256db8084607..3f624f8c7e835 100644
--- a/clang/test/SemaHLSL/BuiltIns/length-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/length-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 void test_too_few_arg()
 {
   return length();
diff --git a/clang/test/SemaHLSL/BuiltIns/logical-mat-operator-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/logical-mat-operator-errors.hlsl
index 693c49c497824..8b1fcd568869c 100644
--- a/clang/test/SemaHLSL/BuiltIns/logical-mat-operator-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/logical-mat-operator-errors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify -DTEST_FUNC=or
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify -DTEST_FUNC=and
 
+using namespace hlsl;
+
 bool2x2 test_mismatched_args(bool2x2 a, bool3x3 b)
 {
   return TEST_FUNC(a, b);
diff --git a/clang/test/SemaHLSL/BuiltIns/logical-operator-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/logical-operator-errors.hlsl
index e30150dccb870..6c99d8ab5e2d2 100644
--- a/clang/test/SemaHLSL/BuiltIns/logical-operator-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/logical-operator-errors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify -DTEST_FUNC=__builtin_hlsl_or
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify -DTEST_FUNC=__builtin_hlsl_and
 
+using namespace hlsl;
+
 
 bool test_too_few_arg(bool a)
 {
diff --git a/clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl
index 3d39b5e7dfea6..48d567fa1806d 100644
--- a/clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/mad-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 float2 test_no_second_arg(float2 p0) {
   return __builtin_hlsl_mad(p0);
   // expected-error at -1 {{too few arguments to function call, expected 3, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/matrix-basic_types-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/matrix-basic_types-errors.hlsl
index 6a6f14b52cb16..f5f579ea336c8 100644
--- a/clang/test/SemaHLSL/BuiltIns/matrix-basic_types-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/matrix-basic_types-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 uint64_t5x5 mat;
 // expected-error at -1  {{unknown type name 'uint64_t5x5'}}
 
diff --git a/clang/test/SemaHLSL/BuiltIns/matrix-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/matrix-errors.hlsl
index 2aa127f60ae22..4a19dff8b6cec 100644
--- a/clang/test/SemaHLSL/BuiltIns/matrix-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/matrix-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Some bad declarations
 hlsl::matrix ShouldWorkSomeday; // expected-error{{use of alias template 'hlsl::matrix' requires template arguments}}
 // expected-note@*:* {{template declaration from hidden source: template <class element = float, int rows_count = 4, int cols_count = 4> requires rows_count <= 4 && cols_count <= 4 using matrix = matrix<element, rows_count, cols_count>}}
diff --git a/clang/test/SemaHLSL/BuiltIns/max_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/max_mat-errors.hlsl
index 13e2e8b4449c6..75b0c7e08c93c 100644
--- a/clang/test/SemaHLSL/BuiltIns/max_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/max_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float2x2 test_too_few_arg(float2x2 p0) {
   return __builtin_elementwise_max(p0);
   // expected-error at -1 {{too few arguments to function call, expected 2, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/min_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/min_mat-errors.hlsl
index a92916e17708f..db7203b1616e8 100644
--- a/clang/test/SemaHLSL/BuiltIns/min_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/min_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float2x2 test_too_few_arg(float2x2 p0) {
   return __builtin_elementwise_min(p0);
   // expected-error at -1 {{too few arguments to function call, expected 2, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/mul-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/mul-errors.hlsl
index f7bd2752f7d04..2ae7470afdb75 100644
--- a/clang/test/SemaHLSL/BuiltIns/mul-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/mul-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s -verify
 
+using namespace hlsl;
+
 // expected-note@*:* 108 {{candidate template ignored}}
 
 // Test mul error cases via template overload resolution
diff --git a/clang/test/SemaHLSL/BuiltIns/pow_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/pow_mat-errors.hlsl
index 63f4afb41641a..dacfc0a96a5cb 100644
--- a/clang/test/SemaHLSL/BuiltIns/pow_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/pow_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float2x2 test_too_few_arg(float2x2 p0) {
   return __builtin_elementwise_pow(p0);
   // expected-error at -1 {{too few arguments to function call, expected 2, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/rcp-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/rcp-errors.hlsl
index 79076b4815a6e..a745b109ce877 100644
--- a/clang/test/SemaHLSL/BuiltIns/rcp-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/rcp-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_too_few_arg() {
   return __builtin_hlsl_elementwise_rcp();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/reflect-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/reflect-errors.hlsl
index a60e4c403811c..b98401d24dd4d 100644
--- a/clang/test/SemaHLSL/BuiltIns/reflect-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/reflect-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_no_second_arg(float2 p0) {
   return reflect(p0);
   // expected-error at -1 {{no matching function for call to 'reflect'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/refract-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/refract-errors.hlsl
index 8d9949f52aeb0..0ffee7db00e46 100644
--- a/clang/test/SemaHLSL/BuiltIns/refract-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/refract-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_no_second_arg(float3 p0) {
   return refract(p0);
   // expected-error at -1 {{no matching function for call to 'refract'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/resource_gather-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/resource_gather-errors.hlsl
index 2fff9f865042e..b748a628acf63 100644
--- a/clang/test/SemaHLSL/BuiltIns/resource_gather-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/resource_gather-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -finclude-default-header -fnative-half-type -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify %s
 
+using namespace hlsl;
+
 // Texture2D<float4>
 using tex_t = __hlsl_resource_t [[hlsl::resource_class("SRV")]]
     [[hlsl::contained_type(float4)]] [[hlsl::dimension("2D")]];
diff --git a/clang/test/SemaHLSL/BuiltIns/resource_getpointer-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/resource_getpointer-errors.hlsl
index 0565941d48b9e..7f5b3e2fd2f0d 100644
--- a/clang/test/SemaHLSL/BuiltIns/resource_getpointer-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/resource_getpointer-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 // RWBuffer<int>
 using handle_t = __hlsl_resource_t
     [[hlsl::resource_class("UAV")]] [[hlsl::contained_type(int)]];
diff --git a/clang/test/SemaHLSL/BuiltIns/resource_load-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/resource_load-errors.hlsl
index 02fcad2801121..8b3a36dd7c0b2 100644
--- a/clang/test/SemaHLSL/BuiltIns/resource_load-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/resource_load-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -finclude-default-header -fnative-half-type -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify %s
 
+using namespace hlsl;
+
 // Texture2D<float4>
 using tex_t = __hlsl_resource_t [[hlsl::resource_class("SRV")]]
     [[hlsl::contained_type(float4)]] [[hlsl::dimension("2D")]];
diff --git a/clang/test/SemaHLSL/BuiltIns/resource_sample-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/resource_sample-errors.hlsl
index 4c2db670e5cb1..57b37e02bd379 100644
--- a/clang/test/SemaHLSL/BuiltIns/resource_sample-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/resource_sample-errors.hlsl
@@ -2,6 +2,8 @@
 // RUN:   -finclude-default-header -fnative-half-type -emit-llvm-only \
 // RUN:   -disable-llvm-passes -verify %s
 
+using namespace hlsl;
+
 // Texture2D<float4>
 using tex_t = __hlsl_resource_t [[hlsl::resource_class("SRV")]]
     [[hlsl::contained_type(float4)]] [[hlsl::dimension("2D")]];
diff --git a/clang/test/SemaHLSL/BuiltIns/reversebits-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/reversebits-errors.hlsl
index 5b33b89cb8eb8..87952f74f5164 100644
--- a/clang/test/SemaHLSL/BuiltIns/reversebits-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/reversebits-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 
 double2 test_int_builtin(double2 p0) {
     return __builtin_elementwise_bitreverse(p0);
diff --git a/clang/test/SemaHLSL/BuiltIns/round-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/round-errors.hlsl
index 54feed35379d7..e73aa4cad84ac 100644
--- a/clang/test/SemaHLSL/BuiltIns/round-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/round-errors.hlsl
@@ -1,4 +1,6 @@
 
+using namespace hlsl;
+
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected
 
 float test_too_few_arg() {
diff --git a/clang/test/SemaHLSL/BuiltIns/rsqrt-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/rsqrt-errors.hlsl
index cedfcca35225e..858386a03121f 100644
--- a/clang/test/SemaHLSL/BuiltIns/rsqrt-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/rsqrt-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_too_few_arg() {
   return __builtin_hlsl_elementwise_rsqrt();
   // expected-error at -1 {{too few arguments to function call, expected 1, have 0}}
diff --git a/clang/test/SemaHLSL/BuiltIns/saturate-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/saturate-errors.hlsl
index 4054ebfb3f649..9e9ab79f9e224 100644
--- a/clang/test/SemaHLSL/BuiltIns/saturate-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/saturate-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected -Werror
 
+using namespace hlsl;
+
 float2 test_no_arg() {
   return saturate();
   // expected-error at -1 {{no matching function for call to 'saturate'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/select-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/select-errors.hlsl
index 6b69566311dfa..137377eb58800 100644
--- a/clang/test/SemaHLSL/BuiltIns/select-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/select-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 
 int test_select_first_arg_wrong_type(int1 p0, int t0, int f0) {
   return select(p0, t0, f0); // expected-warning{{implicit conversion turns vector to scalar: 'int1' (aka 'vector<int, 1>') to 'bool'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/select_mat-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/select_mat-errors.hlsl
index f21b048222f29..6d8a3e080cfff 100644
--- a/clang/test/SemaHLSL/BuiltIns/select_mat-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/select_mat-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 int2x2 test_first_arg_wrong_type(int2x2 p0, int2x2 t0, int2x2 f0) {
   // expected-error at +4{{cannot pass object of non-trivial type 'int2x2' (aka 'matrix<int, 2, 2>') through variadic function; call will abort at runtime}}
   // expected-error at +3{{cannot pass object of non-trivial type 'int2x2' (aka 'matrix<int, 2, 2>') through variadic function; call will abort at runtime}}
diff --git a/clang/test/SemaHLSL/BuiltIns/smoothstep-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/smoothstep-errors.hlsl
index 42f5f188570b6..947f1a8bf8d91 100644
--- a/clang/test/SemaHLSL/BuiltIns/smoothstep-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/smoothstep-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 float test_no_second_arg(float2 p0) {
   return smoothstep(p0);
   // expected-error at -1 {{no matching function for call to 'smoothstep'}}
diff --git a/clang/test/SemaHLSL/BuiltIns/splitdouble-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/splitdouble-errors.hlsl
index 08645014b61e4..502b22ec20ec0 100644
--- a/clang/test/SemaHLSL/BuiltIns/splitdouble-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/splitdouble-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -verify
 
+using namespace hlsl;
+
 void test_no_second_arg(double D) {
   __builtin_hlsl_elementwise_splitdouble(D);
  // expected-error at -1 {{too few arguments to function call, expected 3, have 1}}
diff --git a/clang/test/SemaHLSL/BuiltIns/step-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/step-errors.hlsl
index f8397a699679c..81b35a486173b 100644
--- a/clang/test/SemaHLSL/BuiltIns/step-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/step-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 void test_too_few_arg()
 {
   return step();
diff --git a/clang/test/SemaHLSL/BuiltIns/ternary-compat-overload-warnings.hlsl b/clang/test/SemaHLSL/BuiltIns/ternary-compat-overload-warnings.hlsl
index c893bd1d39a97..c28152af3ba43 100644
--- a/clang/test/SemaHLSL/BuiltIns/ternary-compat-overload-warnings.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/ternary-compat-overload-warnings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes -DFUNC=lerp %s 2>&1 | FileCheck %s -DFUNC=lerp
 
+using namespace hlsl;
+
 // ternary double overloads
 float test_ternary_double(double p0) {
   // CHECK: warning: '[[FUNC]]' is deprecated: In 202x 64 bit API lowering for [[FUNC]] is deprecated. Explicitly cast parameters to 32 or 16 bit types.
diff --git a/clang/test/SemaHLSL/BuiltIns/transpose-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/transpose-errors.hlsl
index 943e21ee38496..fac08b7517761 100644
--- a/clang/test/SemaHLSL/BuiltIns/transpose-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/transpose-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library %s -verify
 
+using namespace hlsl;
+
 // Test transpose error cases
 
 float test_transpose_scalar(float a) {
diff --git a/clang/test/SemaHLSL/BuiltIns/unary-compat-overload-warnings.hlsl b/clang/test/SemaHLSL/BuiltIns/unary-compat-overload-warnings.hlsl
index 9ae1fea6434b3..4fe4d57a6a58a 100644
--- a/clang/test/SemaHLSL/BuiltIns/unary-compat-overload-warnings.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/unary-compat-overload-warnings.hlsl
@@ -23,6 +23,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes -DFUNC=trunc %s 2>&1 | FileCheck %s -DFUNC=trunc
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes -DFUNC=radians %s 2>&1 | FileCheck %s -DFUNC=radians
 
+using namespace hlsl;
+
 // unary double overloads
 float test_unary_double(double p0) {
   // CHECK: warning: '[[FUNC]]' is deprecated: In 202x 64 bit API lowering for [[FUNC]] is deprecated. Explicitly cast parameters to 32 or 16 bit types.
diff --git a/clang/test/SemaHLSL/BuiltIns/vec-scalar-compat-overload-warnings.hlsl b/clang/test/SemaHLSL/BuiltIns/vec-scalar-compat-overload-warnings.hlsl
index 6a8a858ec7e3a..8d886e0b697e0 100644
--- a/clang/test/SemaHLSL/BuiltIns/vec-scalar-compat-overload-warnings.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/vec-scalar-compat-overload-warnings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxilv1.0-unknown-shadermodel6.0-library -std=hlsl202x -emit-llvm-only -disable-llvm-passes %s 2>&1 | FileCheck %s
 
+using namespace hlsl;
+
 float2 clamp_test1(float2 p0, float2 p1, float p2) {
   // CHECK: warning: 'clamp<float, 2U>' is deprecated: In 202x mismatched vector/scalar lowering for clamp is deprecated. Explicitly cast parameters.
   return clamp(p0, p1, p2);
diff --git a/clang/test/SemaHLSL/BuiltIns/vector-errors.hlsl b/clang/test/SemaHLSL/BuiltIns/vector-errors.hlsl
index 7af10a05f76f3..f76335fb30ded 100644
--- a/clang/test/SemaHLSL/BuiltIns/vector-errors.hlsl
+++ b/clang/test/SemaHLSL/BuiltIns/vector-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Some bad declarations
 hlsl::vector ShouldWorkSomeday; // expected-error{{use of alias template 'hlsl::vector' requires template arguments}}
 // expected-note@*:* {{template declaration from hidden source: template <class element = float, int element_count = 4> using vector = vector<element, element_count>}}
diff --git a/clang/test/SemaHLSL/Language/AggregateSplatCast-errors.hlsl b/clang/test/SemaHLSL/Language/AggregateSplatCast-errors.hlsl
index d180611263fe4..87224907aa615 100644
--- a/clang/test/SemaHLSL/Language/AggregateSplatCast-errors.hlsl
+++ b/clang/test/SemaHLSL/Language/AggregateSplatCast-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 struct S {
   int A : 8;
   int B;
diff --git a/clang/test/SemaHLSL/Language/AggregateSplatCasts.hlsl b/clang/test/SemaHLSL/Language/AggregateSplatCasts.hlsl
index 623fca0ef9aca..13c99d4aaff2b 100644
--- a/clang/test/SemaHLSL/Language/AggregateSplatCasts.hlsl
+++ b/clang/test/SemaHLSL/Language/AggregateSplatCasts.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -fnative-half-type %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 // splat from vec1 to vec
 // CHECK-LABEL: call1
 // CHECK: CStyleCastExpr {{.*}} 'int3':'vector<int, 3>' <HLSLAggregateSplatCast>
diff --git a/clang/test/SemaHLSL/Language/AssignArray.hlsl b/clang/test/SemaHLSL/Language/AssignArray.hlsl
index 16b60fe40f806..777ce64679960 100644
--- a/clang/test/SemaHLSL/Language/AssignArray.hlsl
+++ b/clang/test/SemaHLSL/Language/AssignArray.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 typedef vector<int,4> int8[2];
 
 export void fn(int8 A) {
diff --git a/clang/test/SemaHLSL/Language/ConstexprVectorCasts.hlsl b/clang/test/SemaHLSL/Language/ConstexprVectorCasts.hlsl
index fbacb44931c99..59dd0ea71a8e6 100644
--- a/clang/test/SemaHLSL/Language/ConstexprVectorCasts.hlsl
+++ b/clang/test/SemaHLSL/Language/ConstexprVectorCasts.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -finclude-default-header -fnative-int16-type -fnative-half-type -fexperimental-new-constant-interpreter -verify=expected,both %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -finclude-default-header -fnative-int16-type -fnative-half-type                                         -verify=ref,both %s
 
+using namespace hlsl;
+
 const float3 F;
 
 struct S {
diff --git a/clang/test/SemaHLSL/Language/ElementwiseCast-errors.hlsl b/clang/test/SemaHLSL/Language/ElementwiseCast-errors.hlsl
index b8fb1b4596d2a..ea66e2c9f9bea 100644
--- a/clang/test/SemaHLSL/Language/ElementwiseCast-errors.hlsl
+++ b/clang/test/SemaHLSL/Language/ElementwiseCast-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -verify
 
+using namespace hlsl;
+
 export void cantCast() {
   int A[3] = {1,2,3};
   int B[4] = {1,2,3,4};
diff --git a/clang/test/SemaHLSL/Language/ElementwiseCasts.hlsl b/clang/test/SemaHLSL/Language/ElementwiseCasts.hlsl
index 9d296a9798a9c..fd75f08b2b432 100644
--- a/clang/test/SemaHLSL/Language/ElementwiseCasts.hlsl
+++ b/clang/test/SemaHLSL/Language/ElementwiseCasts.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -fnative-half-type %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 // truncation
 // CHECK-LABEL: call1
 // CHECK: CStyleCastExpr {{.*}} 'int[1]' <HLSLElementwiseCast>
diff --git a/clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl b/clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl
index 76f3a4a698ea6..7ede8428525c4 100644
--- a/clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl
+++ b/clang/test/SemaHLSL/Language/InitIncompleteArrays.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -verify -Wdouble-promotion %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -fexperimental-new-constant-interpreter -verify -Wdouble-promotion %s
 
+using namespace hlsl;
+
 // Some helpers!
 template <typename T, typename U>
 struct is_same {
diff --git a/clang/test/SemaHLSL/Language/InitListAST.hlsl b/clang/test/SemaHLSL/Language/InitListAST.hlsl
index 0a2398a5ce49d..903e64626339f 100644
--- a/clang/test/SemaHLSL/Language/InitListAST.hlsl
+++ b/clang/test/SemaHLSL/Language/InitListAST.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -disable-llvm-passes -finclude-default-header -ast-dump -ast-dump-filter=case %s | FileCheck %s
 
+using namespace hlsl;
+
 struct TwoFloats {
   float X, Y;
 };
diff --git a/clang/test/SemaHLSL/Language/InitLists.hlsl b/clang/test/SemaHLSL/Language/InitLists.hlsl
index f86b029713515..c2db9e392ee33 100644
--- a/clang/test/SemaHLSL/Language/InitLists.hlsl
+++ b/clang/test/SemaHLSL/Language/InitLists.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -verify -Wdouble-promotion %s
 
+using namespace hlsl;
+
 struct TwoFloats {
   float X, Y;
 };
diff --git a/clang/test/SemaHLSL/Language/MatrixSplatCasts.hlsl b/clang/test/SemaHLSL/Language/MatrixSplatCasts.hlsl
index 985b18a3cf705..33f02ba2f3171 100644
--- a/clang/test/SemaHLSL/Language/MatrixSplatCasts.hlsl
+++ b/clang/test/SemaHLSL/Language/MatrixSplatCasts.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -fnative-half-type %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 // Test matrix splats where the initializer scalar type differs from matrix element type.
 
 // Bool to int matrix splat
diff --git a/clang/test/SemaHLSL/Language/OutputParameters.hlsl b/clang/test/SemaHLSL/Language/OutputParameters.hlsl
index 8031311f8499e..fa569066ebf6a 100644
--- a/clang/test/SemaHLSL/Language/OutputParameters.hlsl
+++ b/clang/test/SemaHLSL/Language/OutputParameters.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -verify -Wdouble-promotion %s
 
+using namespace hlsl;
+
 void OutVecFn(out float3) {}
 void InOutVecFn(inout float3) {}
 
diff --git a/clang/test/SemaHLSL/Language/UsualArithmeticConversions.hlsl b/clang/test/SemaHLSL/Language/UsualArithmeticConversions.hlsl
index ba3141582d689..acc3cc3cfa9f5 100644
--- a/clang/test/SemaHLSL/Language/UsualArithmeticConversions.hlsl
+++ b/clang/test/SemaHLSL/Language/UsualArithmeticConversions.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -std=hlsl2018 -finclude-default-header -fnative-half-type %s -DERRORS -Wdouble-promotion -verify
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -fnative-half-type %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 #if __HLSL_VERSION <= 2021
 // expected-warning@*{{support for HLSL language version hlsl2018 is incomplete, recommend using hlsl202x instead}}
 #endif
diff --git a/clang/test/SemaHLSL/Language/Volatile.hlsl b/clang/test/SemaHLSL/Language/Volatile.hlsl
index 4b0f1e63baf34..cf688a0a4959b 100644
--- a/clang/test/SemaHLSL/Language/Volatile.hlsl
+++ b/clang/test/SemaHLSL/Language/Volatile.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -verify %s
 
+using namespace hlsl;
+
 RWByteAddressBuffer gBuf : register(u0);
 
 [numthreads(1,1,1)]
diff --git a/clang/test/SemaHLSL/Language/groupsharedArgs/ExplicitCast.hlsl b/clang/test/SemaHLSL/Language/groupsharedArgs/ExplicitCast.hlsl
index 83b4454c07c1e..7d700a8a1508f 100644
--- a/clang/test/SemaHLSL/Language/groupsharedArgs/ExplicitCast.hlsl
+++ b/clang/test/SemaHLSL/Language/groupsharedArgs/ExplicitCast.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -std=hlsl202x -fnative-half-type -fnative-int16-type -verify -Wconversion %s
 
+using namespace hlsl;
+
 groupshared uint16_t SharedData;
 
 void fn1(groupshared half Sh) {
diff --git a/clang/test/SemaHLSL/Language/groupsharedArgs/ExportNoInlineTest.hlsl b/clang/test/SemaHLSL/Language/groupsharedArgs/ExportNoInlineTest.hlsl
index c120adb4a4fbc..0448f91b67f85 100644
--- a/clang/test/SemaHLSL/Language/groupsharedArgs/ExportNoInlineTest.hlsl
+++ b/clang/test/SemaHLSL/Language/groupsharedArgs/ExportNoInlineTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -std=hlsl202x -verify -Wconversion %s
 
+using namespace hlsl;
+
 export void fn1(groupshared uint Sh) {
 // expected-error at -1{{'export' attribute is not compatible with 'groupshared' parameter attribute}}
   Sh = 5;
diff --git a/clang/test/SemaHLSL/Language/groupsharedArgs/InOut.hlsl b/clang/test/SemaHLSL/Language/groupsharedArgs/InOut.hlsl
index e8ab07b7d3a77..14e30d57adb2e 100644
--- a/clang/test/SemaHLSL/Language/groupsharedArgs/InOut.hlsl
+++ b/clang/test/SemaHLSL/Language/groupsharedArgs/InOut.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -std=hlsl202x -verify -Wconversion %s
 
+using namespace hlsl;
+
 groupshared uint SharedData;
 
 void fn1(inout uint Sh) {
diff --git a/clang/test/SemaHLSL/Language/groupsharedArgs/NotGroupSharedTest.hlsl b/clang/test/SemaHLSL/Language/groupsharedArgs/NotGroupSharedTest.hlsl
index 2625b5769089b..1885850996bfb 100644
--- a/clang/test/SemaHLSL/Language/groupsharedArgs/NotGroupSharedTest.hlsl
+++ b/clang/test/SemaHLSL/Language/groupsharedArgs/NotGroupSharedTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -finclude-default-header -std=hlsl202x -fnative-half-type -fnative-int16-type -verify -Wconversion %s
 
+using namespace hlsl;
+
 void fn1(groupshared half Sh) {
 // expected-note at -1{{candidate function not viable: cannot bind reference in generic address space to object in address space 'groupshared' in 1st argument}}
   Sh = 5;
diff --git a/clang/test/SemaHLSL/Language/groupsharedArgs/ScalarTest.hlsl b/clang/test/SemaHLSL/Language/groupsharedArgs/ScalarTest.hlsl
index e5db9bfc7a8a6..5746ff42043e3 100644
--- a/clang/test/SemaHLSL/Language/groupsharedArgs/ScalarTest.hlsl
+++ b/clang/test/SemaHLSL/Language/groupsharedArgs/ScalarTest.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -std=hlsl202x -fnative-half-type -fnative-int16-type -verify -Wconversion %s
 
+using namespace hlsl;
+
 groupshared uint16_t SharedData;
 
 void fn1(groupshared half Sh) {
diff --git a/clang/test/SemaHLSL/MatrixElementOverloadResolution.hlsl b/clang/test/SemaHLSL/MatrixElementOverloadResolution.hlsl
index e0619c2987fbc..fd2764b43ea59 100644
--- a/clang/test/SemaHLSL/MatrixElementOverloadResolution.hlsl
+++ b/clang/test/SemaHLSL/MatrixElementOverloadResolution.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -Wconversion -verify -o - %s -DERROR=1
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies floating point type implicit conversion ranks for overload
 // resolution. In HLSL the built-in type ranks are half < float < double. This
 // applies to both scalar and matrix types.
diff --git a/clang/test/SemaHLSL/Operators/frem_modulo-errors.hlsl b/clang/test/SemaHLSL/Operators/frem_modulo-errors.hlsl
index 1c6e45693a12f..191fb68a17d05 100644
--- a/clang/test/SemaHLSL/Operators/frem_modulo-errors.hlsl
+++ b/clang/test/SemaHLSL/Operators/frem_modulo-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -emit-llvm-only -disable-llvm-passes -verify
 
+using namespace hlsl;
+
 export double2 double_vec_mod_by_int(double2 p1) {
     return  p1 % 2;
     // expected-error at -1 {{invalid operands to binary expression ('double2' (aka 'vector<double, 2>') and 'int')}}
diff --git a/clang/test/SemaHLSL/Operators/half-vector-comparisons.hlsl b/clang/test/SemaHLSL/Operators/half-vector-comparisons.hlsl
index f3be50ef6fc62..20caf09988f40 100644
--- a/clang/test/SemaHLSL/Operators/half-vector-comparisons.hlsl
+++ b/clang/test/SemaHLSL/Operators/half-vector-comparisons.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -ast-dump -ast-dump-filter=test | FileCheck %s
 
+using namespace hlsl;
+
 // Regression test for issue llvm/llvm-project#213814
 
 // CHECK-LABEL: FunctionDecl {{.*}} test_lt 'int4 (half4, half4)'
diff --git a/clang/test/SemaHLSL/Operators/logical-not.hlsl b/clang/test/SemaHLSL/Operators/logical-not.hlsl
index bd1a4be84c47f..fe4583761c0d3 100644
--- a/clang/test/SemaHLSL/Operators/logical-not.hlsl
+++ b/clang/test/SemaHLSL/Operators/logical-not.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple  dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -ast-dump -ast-dump-filter=case | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-LABEL: FunctionDecl {{.*}} used case1 'uint32_t2 (uint32_t2)'
 // CHECK-NEXT: ParmVarDecl {{.*}} used b 'uint32_t2':'vector<uint32_t, 2>'
 // CHECK-NEXT: CompoundStmt
diff --git a/clang/test/SemaHLSL/Operators/matrix-comparisons.hlsl b/clang/test/SemaHLSL/Operators/matrix-comparisons.hlsl
index e2e67bce4fd52..ffb399b5de17e 100644
--- a/clang/test/SemaHLSL/Operators/matrix-comparisons.hlsl
+++ b/clang/test/SemaHLSL/Operators/matrix-comparisons.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -Wno-implicit-int-float-conversion %s -ast-dump -ast-dump-filter=test | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -Wno-implicit-int-float-conversion %s -DERRORS -verify
 
+using namespace hlsl;
+
 // CHECK-LABEL: FunctionDecl {{.*}} test_matrix_matrix 'bool2x2 (float2x2, float2x2)'
 // CHECK: BinaryOperator {{.*}} 'matrix<bool, 2, 2>' '<'
 // CHECK-NEXT: ImplicitCastExpr {{.*}} 'float2x2':'matrix<float, 2, 2>' <LValueToRValue>
diff --git a/clang/test/SemaHLSL/Resources/ConstantBuffers.hlsl b/clang/test/SemaHLSL/Resources/ConstantBuffers.hlsl
index 2e237deb1c315..46471e6707167 100644
--- a/clang/test/SemaHLSL/Resources/ConstantBuffers.hlsl
+++ b/clang/test/SemaHLSL/Resources/ConstantBuffers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 struct S {
   float a;
   int b;
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/array_partial_init_dynamic.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/array_partial_init_dynamic.hlsl
index e21ad79a1af62..ffd17ef588254 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/array_partial_init_dynamic.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/array_partial_init_dynamic.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 // A *local* resource array indexed by a runtime value. Every element the index
 // can select holds the same global, so there is one unique binding and nothing
 // to warn about. `& 1` keeps the index off the unassigned elements 2 and 3.
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/assign_wrong_type.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/assign_wrong_type.hlsl
index 666d1097d0bf9..3d228ef925138 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/assign_wrong_type.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/assign_wrong_type.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 // expected-note@*:* {{candidate function not viable: no known conversion from 'RWStructuredBuffer<uint>' (aka 'RWStructuredBuffer<unsigned int>') to 'const hlsl::RWByteAddressBuffer' for 1st argument}}
 RWByteAddressBuffer GBuf0 : register(u0);
 RWStructuredBuffer<uint> GSB : register(u1);
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/bindings.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/bindings.hlsl
index c64818029b40d..1d6e8f1d36850 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/bindings.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/bindings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 RWBuffer<uint> In : register(u0);
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/bindings_errs.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/bindings_errs.hlsl
index 1a4b33ec86653..b68d8e21f0766 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/bindings_errs.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/bindings_errs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 RWBuffer<uint> In : register(u0);
 RWStructuredBuffer<uint> Out0 : register(u1);
 RWStructuredBuffer<uint> Out1 : register(u2);
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/branched_reassign_ambiguous.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/branched_reassign_ambiguous.hlsl
index b2c4b005178dd..a8fe4abe6010e 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/branched_reassign_ambiguous.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/branched_reassign_ambiguous.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 RWByteAddressBuffer GBuf1 : register(u1);
 RWByteAddressBuffer GBuf2 : register(u2);
 
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/const_local_store.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/const_local_store.hlsl
index 2b35107bea304..a782a72347bc4 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/const_local_store.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/const_local_store.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 // A const local resource rejects mutating methods. Reading is still allowed,
 // so LoadConst shows the restriction is on mutation rather than on const
 // resources generally.
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/explicit_register.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/explicit_register.hlsl
index 33ab268ab5c5d..a04a854b04b37 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/explicit_register.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/explicit_register.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 RWByteAddressBuffer G0 : register(u0);
 
 [numthreads(1,1,1)]
diff --git a/clang/test/SemaHLSL/Resources/Local-Resources/static_const.hlsl b/clang/test/SemaHLSL/Resources/Local-Resources/static_const.hlsl
index 5ad3e237e8e3e..f5108b8ba414e 100644
--- a/clang/test/SemaHLSL/Resources/Local-Resources/static_const.hlsl
+++ b/clang/test/SemaHLSL/Resources/Local-Resources/static_const.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -std=hlsl202x -finclude-default-header -triple dxil-pc-shadermodel6.6-compute %s -emit-llvm -o - -verify
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 RWByteAddressBuffer GBuf0 : register(u0);
 
diff --git a/clang/test/SemaHLSL/Resources/MultiSampledTextures-Sema.hlsl b/clang/test/SemaHLSL/Resources/MultiSampledTextures-Sema.hlsl
index 40236507d85e2..d77e0be998111 100644
--- a/clang/test/SemaHLSL/Resources/MultiSampledTextures-Sema.hlsl
+++ b/clang/test/SemaHLSL/Resources/MultiSampledTextures-Sema.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -finclude-default-header -fsyntax-only -verify -DTEXTURE=Texture2DMS -DLOCATION_TYPE=int2 -DINDEX_TYPE=uint2 %s
 
+using namespace hlsl;
+
 // A multisampled texture supports the sample-indexed Load and operator[], but
 // does not support Sample/SampleBias/SampleGrad/SampleLevel/SampleCmp, Gather,
 // CalculateLevelOfDetail, or mips.
diff --git a/clang/test/SemaHLSL/Resources/SampleCount-template-arg-errors.hlsl b/clang/test/SemaHLSL/Resources/SampleCount-template-arg-errors.hlsl
index 96c5f1ba45529..8f85044895526 100644
--- a/clang/test/SemaHLSL/Resources/SampleCount-template-arg-errors.hlsl
+++ b/clang/test/SemaHLSL/Resources/SampleCount-template-arg-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // The `sample_count` non-type template parameter only exists on multisampled
 // texture types. Every other resource type takes just an `element_type`, so
 // providing a second template argument must be diagnosed as too many template
diff --git a/clang/test/SemaHLSL/Resources/Textures-CalculateLevelOfDetail.hlsl b/clang/test/SemaHLSL/Resources/Textures-CalculateLevelOfDetail.hlsl
index ac91fb789dd8d..6fd165b48a035 100644
--- a/clang/test/SemaHLSL/Resources/Textures-CalculateLevelOfDetail.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-CalculateLevelOfDetail.hlsl
@@ -20,6 +20,8 @@
 // RUN:   -finclude-default-header -fsyntax-only -verify=expected,dim3 \
 // RUN:   -DTEXTURE=TextureCubeArray -DLOD_TYPE=float3 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-Gather.hlsl b/clang/test/SemaHLSL/Resources/Textures-Gather.hlsl
index 10a2251dbe350..c0037663104cc 100644
--- a/clang/test/SemaHLSL/Resources/Textures-Gather.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-Gather.hlsl
@@ -5,6 +5,8 @@
 // RUN:   -fsyntax-only -verify -finclude-default-header \
 // RUN:   -DTEXTURE=Texture2DArray -DOFFSET_TYPE=int2 -DCOORD_TYPE=float3 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-GatherCmp-Vulkan.hlsl b/clang/test/SemaHLSL/Resources/Textures-GatherCmp-Vulkan.hlsl
index bb9806dc2f6f0..8b6959c7ce803 100644
--- a/clang/test/SemaHLSL/Resources/Textures-GatherCmp-Vulkan.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-GatherCmp-Vulkan.hlsl
@@ -4,6 +4,8 @@
 // RUN:   -finclude-default-header -DTEXTURE=Texture2DArray \
 // RUN:   -DCOORD_TYPE=float3 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-GetDimensions.hlsl b/clang/test/SemaHLSL/Resources/Textures-GetDimensions.hlsl
index 2af57ecb8aa3f..97f223265eb92 100644
--- a/clang/test/SemaHLSL/Resources/Textures-GetDimensions.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-GetDimensions.hlsl
@@ -11,6 +11,8 @@
 // RUN:   -finclude-default-header -fsyntax-only -DTEXTURE=RWTexture2DArray \
 // RUN:   -verify %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-Load-errors.hlsl b/clang/test/SemaHLSL/Resources/Textures-Load-errors.hlsl
index 1d8fae8f1ebe4..45bfeb512ffff 100644
--- a/clang/test/SemaHLSL/Resources/Textures-Load-errors.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-Load-errors.hlsl
@@ -26,6 +26,8 @@
 // RUN:   -DLOAD_FLOAT_TYPE=float3 -DNARROW_LOAD_TYPE=int2 \
 // RUN:   -DWIDE_LOAD_TYPE=int4 -DOFFSET_TYPE=int3 -verify %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-SampleBias.hlsl b/clang/test/SemaHLSL/Resources/Textures-SampleBias.hlsl
index ca24ff804a739..6b24501463f7b 100644
--- a/clang/test/SemaHLSL/Resources/Textures-SampleBias.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-SampleBias.hlsl
@@ -27,6 +27,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_TYPE=int3 \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-SampleCmp.hlsl b/clang/test/SemaHLSL/Resources/Textures-SampleCmp.hlsl
index d7509b583285d..2aed08f45641f 100644
--- a/clang/test/SemaHLSL/Resources/Textures-SampleCmp.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-SampleCmp.hlsl
@@ -23,6 +23,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_ARG="int3(1, 2, 3)" \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-SampleCmpLevelZero.hlsl b/clang/test/SemaHLSL/Resources/Textures-SampleCmpLevelZero.hlsl
index 55ef4a1952f1a..de9de6ba6ae87 100644
--- a/clang/test/SemaHLSL/Resources/Textures-SampleCmpLevelZero.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-SampleCmpLevelZero.hlsl
@@ -23,6 +23,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_ARG="int3(1, 2, 3)" \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-SampleGrad.hlsl b/clang/test/SemaHLSL/Resources/Textures-SampleGrad.hlsl
index f4accded102d9..883abe4386953 100644
--- a/clang/test/SemaHLSL/Resources/Textures-SampleGrad.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-SampleGrad.hlsl
@@ -27,6 +27,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_TYPE=int3 \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 -DGRAD_TYPE=float3 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-SampleLevel.hlsl b/clang/test/SemaHLSL/Resources/Textures-SampleLevel.hlsl
index 2b95584c58b60..f804c14ac138c 100644
--- a/clang/test/SemaHLSL/Resources/Textures-SampleLevel.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-SampleLevel.hlsl
@@ -27,6 +27,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_TYPE=int3 \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-Sema.hlsl b/clang/test/SemaHLSL/Resources/Textures-Sema.hlsl
index 579f9c045b929..aaa9f273f0a69 100644
--- a/clang/test/SemaHLSL/Resources/Textures-Sema.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-Sema.hlsl
@@ -27,6 +27,8 @@
 // RUN:   -verify=expected,nooffset,dim3 -DOFFSET_ARG="int3(1, 2, 3)" \
 // RUN:   -DTEXTURE=TextureCubeArray -DCOORD_TYPE=float4 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-Subscript.hlsl b/clang/test/SemaHLSL/Resources/Textures-Subscript.hlsl
index 599ee5ae36f78..7acb52979beeb 100644
--- a/clang/test/SemaHLSL/Resources/Textures-Subscript.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-Subscript.hlsl
@@ -47,6 +47,8 @@
 // RUN:   -verify=expected,vecidx \
 // RUN:   -o - %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-declaration-order.hlsl b/clang/test/SemaHLSL/Resources/Textures-declaration-order.hlsl
index 49e214d3f2fdb..faa29ad56a4c2 100644
--- a/clang/test/SemaHLSL/Resources/Textures-declaration-order.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-declaration-order.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -fsyntax-only -finclude-default-header -verify -DSCALAR_FIRST %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -fsyntax-only -finclude-default-header -verify -USCALAR_FIRST %s
 
+using namespace hlsl;
+
 // Texture resource classes are declared as a primary class template, used for
 // scalar element types, plus a partial specialization used for vector element
 // types. Both patterns are only defined on demand by HLSLExternalSemaSource, so
diff --git a/clang/test/SemaHLSL/Resources/Textures-derivative-availability.hlsl b/clang/test/SemaHLSL/Resources/Textures-derivative-availability.hlsl
index db7323c33de5b..53d679b235278 100644
--- a/clang/test/SemaHLSL/Resources/Textures-derivative-availability.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-derivative-availability.hlsl
@@ -15,6 +15,8 @@
 // RUN:   -DTEXTURE=Texture2DArray -DLOD_TYPE=float2 -DGRAD_TYPE=float2 \
 // RUN:   -DCOORD_TYPE=float3 %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-double-element-type-errors.hlsl b/clang/test/SemaHLSL/Resources/Textures-double-element-type-errors.hlsl
index 7ba69e39e45e3..fe74e7c54bb2d 100644
--- a/clang/test/SemaHLSL/Resources/Textures-double-element-type-errors.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-double-element-type-errors.hlsl
@@ -6,6 +6,8 @@
 // RUN:   -DCOORD_TYPE=float3 -DGRAD_TYPE=float2 -DLOAD_TYPE=int4 \
 // RUN:   -DINDEX_TYPE=uint3 -verify %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-integer-element-type.hlsl b/clang/test/SemaHLSL/Resources/Textures-integer-element-type.hlsl
index 4e15ff1354a19..e0683d7ed2d87 100644
--- a/clang/test/SemaHLSL/Resources/Textures-integer-element-type.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-integer-element-type.hlsl
@@ -19,6 +19,8 @@
 // RUN:   -DTEXTURE=Texture2D -DGRAD_TYPE=float2 -DCOORD_TYPE=float2 \
 // RUN:   -verify=expected %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-mips-errors.hlsl b/clang/test/SemaHLSL/Resources/Textures-mips-errors.hlsl
index d521e11463afc..21340cba6b3d1 100644
--- a/clang/test/SemaHLSL/Resources/Textures-mips-errors.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-mips-errors.hlsl
@@ -35,6 +35,8 @@
 // RUN:   -emit-llvm-only -disable-llvm-passes -finclude-default-header \
 // RUN:   -DTEXTURE=RWTexture3D -verify %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/Textures-unsupported-methods-errors.hlsl b/clang/test/SemaHLSL/Resources/Textures-unsupported-methods-errors.hlsl
index 856c5b00c1820..189254a5056e3 100644
--- a/clang/test/SemaHLSL/Resources/Textures-unsupported-methods-errors.hlsl
+++ b/clang/test/SemaHLSL/Resources/Textures-unsupported-methods-errors.hlsl
@@ -36,6 +36,8 @@
 // RUN:   -finclude-default-header -DHAS_TEXEL -DTEXTURE=RWTexture3D \
 // RUN:   -DCOORD_TYPE=float3 -DGRAD_TYPE=float3 -DOFFSET_TYPE=int3 -verify %s
 
+using namespace hlsl;
+
 // Parameterized over the texture types in the RUN lines above; adding a texture
 // of another dimension only requires new RUN lines.
 //
diff --git a/clang/test/SemaHLSL/Resources/dynamic-resources-availability.hlsl b/clang/test/SemaHLSL/Resources/dynamic-resources-availability.hlsl
index f1fb89790d010..2bc6fefbe61d7 100644
--- a/clang/test/SemaHLSL/Resources/dynamic-resources-availability.hlsl
+++ b/clang/test/SemaHLSL/Resources/dynamic-resources-availability.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -fhlsl-strict-availability \
 // RUN:   -triple dxil-pc-shadermodel6.5-library -verify %s
 
+using namespace hlsl;
+
 export void testUnavailable(unsigned Index) {
   
   // expected-error at +2 {{'ResourceDescriptorHeap' is only available on Shader Model 6.6 or newer}}
diff --git a/clang/test/SemaHLSL/Resources/dynamic-resources.hlsl b/clang/test/SemaHLSL/Resources/dynamic-resources.hlsl
index 03eab490b65cb..0c78823ad3fb0 100644
--- a/clang/test/SemaHLSL/Resources/dynamic-resources.hlsl
+++ b/clang/test/SemaHLSL/Resources/dynamic-resources.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library -verify %s
 
+using namespace hlsl;
+
 void useBuffer(RWBuffer<int> Buffer) {}
 void useSampler(SamplerState Sampler) {}
 
diff --git a/clang/test/SemaHLSL/Resources/packoffset-invalid.hlsl b/clang/test/SemaHLSL/Resources/packoffset-invalid.hlsl
index f6cb140a991e0..63302b4fd0e8a 100644
--- a/clang/test/SemaHLSL/Resources/packoffset-invalid.hlsl
+++ b/clang/test/SemaHLSL/Resources/packoffset-invalid.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.3-library -fnative-half-type -verify %s
 
+using namespace hlsl;
+
 // expected-warning at +1{{cannot mix packoffset elements with nonpackoffset elements in a cbuffer}}
 cbuffer Mix
 {
diff --git a/clang/test/SemaHLSL/Resources/prohibit_resource_edits.hlsl b/clang/test/SemaHLSL/Resources/prohibit_resource_edits.hlsl
index caffa32fd8085..39554d97a6324 100644
--- a/clang/test/SemaHLSL/Resources/prohibit_resource_edits.hlsl
+++ b/clang/test/SemaHLSL/Resources/prohibit_resource_edits.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -o - -fsyntax-only %s -verify
 
+using namespace hlsl;
+
 RWBuffer<float> A[10]; // expected-note {{variable 'A' is declared here}} expected-note {{variable 'A' is declared here}} // expected-note {{variable 'A' is declared here}}
 RWBuffer<float> B;     // expected-note {{variable 'B' is declared here}}
 RWBuffer<float> C[10];
diff --git a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_basic.hlsl b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_basic.hlsl
index 4e50f70952ad1..c31ae5792c037 100644
--- a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_basic.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_basic.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
 
+using namespace hlsl;
+
 // expected-error at +1{{binding type 't' only applies to SRV resources}}
 float f1 : register(t0);
 
diff --git a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_silence_diags.hlsl b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_silence_diags.hlsl
index cb89c56877389..171115dd2455d 100644
--- a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_silence_diags.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_silence_diags.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only -Wno-legacy-constant-register-binding %s -verify
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 float f2 : register(b9);
 
diff --git a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_space.hlsl b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_space.hlsl
index 0be32c95c0d73..653a4fdbc6778 100644
--- a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_space.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_space.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
 
+using namespace hlsl;
+
 // valid
 cbuffer cbuf {
     RWBuffer<int> r : register(u0, space0);
diff --git a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_uint32_max.hlsl b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_uint32_max.hlsl
index edbcb84405f0e..ac19fb5720f60 100644
--- a/clang/test/SemaHLSL/Resources/resource_binding_attr_error_uint32_max.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_binding_attr_error_uint32_max.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
 
+using namespace hlsl;
+
 // test semantic validation for register numbers that exceed UINT32_MAX
 
 struct S {
diff --git a/clang/test/SemaHLSL/Resources/resource_binding_implicit.hlsl b/clang/test/SemaHLSL/Resources/resource_binding_implicit.hlsl
index 0bba3adffa131..633d2df042db3 100644
--- a/clang/test/SemaHLSL/Resources/resource_binding_implicit.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_binding_implicit.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -Whlsl-implicit-binding -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify
 
+using namespace hlsl;
+
 // expected-warning at +1 {{resource has implicit register binding}}
 cbuffer cb0 {
   int a;
diff --git a/clang/test/SemaHLSL/Resources/resource_params_noinline.hlsl b/clang/test/SemaHLSL/Resources/resource_params_noinline.hlsl
index fbe0a7b070be4..1ac043262db72 100644
--- a/clang/test/SemaHLSL/Resources/resource_params_noinline.hlsl
+++ b/clang/test/SemaHLSL/Resources/resource_params_noinline.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -fsyntax-only -finclude-default-header %s -verify
 
+using namespace hlsl;
+
 // expected-error at +2 {{resource type 'RWBuffer<float>' cannot be used as a parameter of a noinline function}}
 // expected-note at +1 {{attribute is here}}
 __attribute__((noinline)) float resource_param(RWBuffer<float> A) {}
diff --git a/clang/test/SemaHLSL/Resources/resources-in-struct-array-error.hlsl b/clang/test/SemaHLSL/Resources/resources-in-struct-array-error.hlsl
index e98a73812b773..dedf901e72034 100644
--- a/clang/test/SemaHLSL/Resources/resources-in-struct-array-error.hlsl
+++ b/clang/test/SemaHLSL/Resources/resources-in-struct-array-error.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 struct A {
   RWBuffer<float> Buf;
   RWBuffer<float> ManyBufs[5];
diff --git a/clang/test/SemaHLSL/Resources/static_resources.hlsl b/clang/test/SemaHLSL/Resources/static_resources.hlsl
index 1bb4acd250518..8fc6f3beeba0f 100644
--- a/clang/test/SemaHLSL/Resources/static_resources.hlsl
+++ b/clang/test/SemaHLSL/Resources/static_resources.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-compute -emit-llvm -disable-llvm-passes -o - %s | llvm-cxxfilt | FileCheck %s
 
+using namespace hlsl;
+
 // CHECK-DAG: [[ONE_STR:@.*]] = private unnamed_addr constant [4 x i8] c"One\00"
 // CHECK-DAG: [[ARRAY_STR:@.*]] = private unnamed_addr constant [6 x i8] c"Array\00"
 // CHECK-DAG: [[ONEWITHCOUNTER_STR:@.*]] = private unnamed_addr constant [15 x i8] c"OneWithCounter\00"
diff --git a/clang/test/SemaHLSL/Resources/unbounded_resource_arrays.hlsl b/clang/test/SemaHLSL/Resources/unbounded_resource_arrays.hlsl
index 0dc09e2a3c272..0b5200c17f5ed 100644
--- a/clang/test/SemaHLSL/Resources/unbounded_resource_arrays.hlsl
+++ b/clang/test/SemaHLSL/Resources/unbounded_resource_arrays.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -fsyntax-only -finclude-default-header %s -verify
 
+using namespace hlsl;
+
 // unbounded resource array parameter whose resource type has not been used earlier
 // expected-error at +1 {{incomplete resource array in a function parameter}}
 void no_prior_use(RWByteAddressBuffer array_arg[]) {}
diff --git a/clang/test/SemaHLSL/Semantics/arbitrary.ms.input.hlsl b/clang/test/SemaHLSL/Semantics/arbitrary.ms.input.hlsl
index 6849d8cc7ea8a..22ce694a828f1 100644
--- a/clang/test/SemaHLSL/Semantics/arbitrary.ms.input.hlsl
+++ b/clang/test/SemaHLSL/Semantics/arbitrary.ms.input.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-mesh -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-mesh -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 [numthreads(1,1,1)]
 void main(uint a : A) {
 // expected-error at -1 {{semantic 'A' is not supported in mesh shader inputs}}
diff --git a/clang/test/SemaHLSL/Semantics/arbitrary.ps.output.hlsl b/clang/test/SemaHLSL/Semantics/arbitrary.ps.output.hlsl
index cc6104992ed56..b6c0de5c57870 100644
--- a/clang/test/SemaHLSL/Semantics/arbitrary.ps.output.hlsl
+++ b/clang/test/SemaHLSL/Semantics/arbitrary.ps.output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(float4 a : A) : B {
 // expected-error at -1 {{semantic 'B' is not supported in pixel shader outputs}}
   return a;
diff --git a/clang/test/SemaHLSL/Semantics/barycentrics.model.hlsl b/clang/test/SemaHLSL/Semantics/barycentrics.model.hlsl
index 9e52041e3f163..505877d9e2ba1 100644
--- a/clang/test/SemaHLSL/Semantics/barycentrics.model.hlsl
+++ b/clang/test/SemaHLSL/Semantics/barycentrics.model.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.1-library -finclude-default-header -x hlsl -verify=ok -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=ok -o - %s
 
+using namespace hlsl;
+
 // SV_Barycentrics requires shader model 6.1 for DXIL.
 // The shader model does not apply to SPIR-V, which is only run to check that no error is emitted.
 
diff --git a/clang/test/SemaHLSL/Semantics/barycentrics.ps.hlsl b/clang/test/SemaHLSL/Semantics/barycentrics.ps.hlsl
index 25de860b5dc45..9c45b0675eef8 100644
--- a/clang/test/SemaHLSL/Semantics/barycentrics.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/barycentrics.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -DSPIRV -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Type, index and interpolation checks for SV_Barycentrics. These are
 // independent of the shader stage and IO direction, which are covered by
 // barycentrics.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/barycentrics.stages.hlsl b/clang/test/SemaHLSL/Semantics/barycentrics.stages.hlsl
index e8842dc902c38..1981da8b0c2c8 100644
--- a/clang/test/SemaHLSL/Semantics/barycentrics.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/barycentrics.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_Barycentrics: only a pixel input.
 // Type, index and interpolation checks are covered by barycentrics.ps.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/entry_parameter.hlsl b/clang/test/SemaHLSL/Semantics/entry_parameter.hlsl
index 91dbf9c74ad60..0d1f3e40e220e 100644
--- a/clang/test/SemaHLSL/Semantics/entry_parameter.hlsl
+++ b/clang/test/SemaHLSL/Semantics/entry_parameter.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -hlsl-entry CSMain -x hlsl  -finclude-default-header  -ast-dump -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 [numthreads(8,8,1)]
 void CSMain(int GI : SV_GroupIndex, uint ID : SV_DispatchThreadID, uint GID : SV_GroupID, uint GThreadID : SV_GroupThreadID) {
 // CHECK: FunctionDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> line:[[@LINE-1]]:6 CSMain 'void (int, uint, uint, uint)'
diff --git a/clang/test/SemaHLSL/Semantics/instanceid.output.hlsl b/clang/test/SemaHLSL/Semantics/instanceid.output.hlsl
index 2a1ac5ed87573..227d45e636190 100644
--- a/clang/test/SemaHLSL/Semantics/instanceid.output.hlsl
+++ b/clang/test/SemaHLSL/Semantics/instanceid.output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // SV_InstanceID is a system value only on vertex input, so an out parameter is
 // rejected.
 [shader("vertex")]
diff --git a/clang/test/SemaHLSL/Semantics/instanceid.ps.hlsl b/clang/test/SemaHLSL/Semantics/instanceid.ps.hlsl
index 0c1c499cd14c5..8ec741d2e03aa 100644
--- a/clang/test/SemaHLSL/Semantics/instanceid.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/instanceid.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(uint id : SV_InstanceID) : SV_Target {
 // expected-error at -1 {{semantic 'SV_InstanceID' is not supported in pixel shader inputs}}
   return float4(1, 1, 1, 1);
diff --git a/clang/test/SemaHLSL/Semantics/instanceid.vs.hlsl b/clang/test/SemaHLSL/Semantics/instanceid.vs.hlsl
index 68ce36bf25747..347e27ed4db46 100644
--- a/clang/test/SemaHLSL/Semantics/instanceid.vs.hlsl
+++ b/clang/test/SemaHLSL/Semantics/instanceid.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -verify=dxil,expected -o - %s
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=spirv,expected -o - %s
 
+using namespace hlsl;
+
 [shader("vertex")]
 float bad_type_float(float id : SV_InstanceID) : A {
 // dxil-error at -1 {{semantic 'SV_InstanceID' must be a scalar of 16 or 32 bit unsigned integer type (was 'float')}}
diff --git a/clang/test/SemaHLSL/Semantics/invalid_entry_parameter.hlsl b/clang/test/SemaHLSL/Semantics/invalid_entry_parameter.hlsl
index 1e0fc13517ba5..c255110a366b7 100644
--- a/clang/test/SemaHLSL/Semantics/invalid_entry_parameter.hlsl
+++ b/clang/test/SemaHLSL/Semantics/invalid_entry_parameter.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Type and index checks require an entry point.
 
 [shader("compute")][numthreads(8,8,1)]
diff --git a/clang/test/SemaHLSL/Semantics/output-parameters.hlsl b/clang/test/SemaHLSL/Semantics/output-parameters.hlsl
index 06a3b17b13f9f..f6cbc55d714ec 100644
--- a/clang/test/SemaHLSL/Semantics/output-parameters.hlsl
+++ b/clang/test/SemaHLSL/Semantics/output-parameters.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Parameters passed by reference are written by the entry point, so they are
 // verified against the output signature of the shader stage.
 
diff --git a/clang/test/SemaHLSL/Semantics/position.ps.hlsl b/clang/test/SemaHLSL/Semantics/position.ps.hlsl
index bf8dbefdaf86a..903cc430ac439 100644
--- a/clang/test/SemaHLSL/Semantics/position.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/position.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(float4 a : A) : SV_Position {
 // expected-error at -1 {{semantic 'SV_Position' is not supported in pixel shader outputs}}
   return a;
diff --git a/clang/test/SemaHLSL/Semantics/position.ps.size.hlsl b/clang/test/SemaHLSL/Semantics/position.ps.size.hlsl
index 5c7fe8b423110..1bbbd9d6e372e 100644
--- a/clang/test/SemaHLSL/Semantics/position.ps.size.hlsl
+++ b/clang/test/SemaHLSL/Semantics/position.ps.size.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -finclude-default-header -o - %s -verify -verify-ignore-unexpected
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-library  -x hlsl -finclude-default-header -o - %s -verify -verify-ignore-unexpected
 
+using namespace hlsl;
+
 [shader("pixel")]
 void too_many_components(vector<float, 5> a : SV_Position) {
 // expected-error at -1 {{semantic 'SV_Position' must be a scalar or vector of up to 4 components of 16 or 32 bit floating-point type (was 'vector<float, 5>' (vector of 5 'float' values))}}
diff --git a/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl b/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
index 480c9b41a1899..9be30a5fb708d 100644
--- a/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
+++ b/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-pixel -x hlsl -finclude-default-header -o - %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 struct S {
   float4 f0 : SV_Position;
 // CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:10 f0 'float4':'vector<float, 4>'
@@ -13,8 +15,8 @@ struct S {
 float4 main(S s) : SV_Target {
 // CHECK: FunctionDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> line:[[@LINE-1]]:8 main 'float4 (S)'
 // CHECK-NEXT: ParmVarDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:15 used s 'S'
-// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:4:15> "SV_Position" 0
-// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:8:15> "USER" 3
+// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:6:15> "SV_Position" 0
+// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:10:15> "USER" 3
 
 // CHECK:       HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <col:20> "SV_Target" 0
   return s.f1;
diff --git a/clang/test/SemaHLSL/Semantics/position.ps.struct.reuse.hlsl b/clang/test/SemaHLSL/Semantics/position.ps.struct.reuse.hlsl
index 532d73131895b..0d795ee372437 100644
--- a/clang/test/SemaHLSL/Semantics/position.ps.struct.reuse.hlsl
+++ b/clang/test/SemaHLSL/Semantics/position.ps.struct.reuse.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-pixel -x hlsl -finclude-default-header -o - %s -ast-dump | FileCheck %s
 
+using namespace hlsl;
+
 struct A {
   float4 x : A;
 // CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:10 referenced x 'float4':'vector<float, 4>'
diff --git a/clang/test/SemaHLSL/Semantics/primitiveid.ps.errors.hlsl b/clang/test/SemaHLSL/Semantics/primitiveid.ps.errors.hlsl
index 6bee4f9836712..2d38c7f2993ab 100644
--- a/clang/test/SemaHLSL/Semantics/primitiveid.ps.errors.hlsl
+++ b/clang/test/SemaHLSL/Semantics/primitiveid.ps.errors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Invalid type, index and interpolation uses of SV_PrimitiveID. The valid
 // cases are covered by primitiveid.ps.hlsl, and the shader stage and IO
 // direction by primitiveid.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/primitiveid.ps.hlsl b/clang/test/SemaHLSL/Semantics/primitiveid.ps.hlsl
index f6201e54e6788..215f33c359823 100644
--- a/clang/test/SemaHLSL/Semantics/primitiveid.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/primitiveid.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Valid type, index and interpolation uses of SV_PrimitiveID. The invalid
 // cases are covered by primitiveid.ps.errors.hlsl, and the shader stage and IO
 // direction by primitiveid.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/primitiveid.stages.hlsl b/clang/test/SemaHLSL/Semantics/primitiveid.stages.hlsl
index 6feffa29e01ec..cf585accadad2 100644
--- a/clang/test/SemaHLSL/Semantics/primitiveid.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/primitiveid.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_PrimitiveID: only a pixel input.
 // Type, index and interpolation checks are covered by primitiveid.ps.hlsl and
 // primitiveid.ps.errors.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/sampleindex.ps.hlsl b/clang/test/SemaHLSL/Semantics/sampleindex.ps.hlsl
index 63bb531c15e76..80586449c8bd5 100644
--- a/clang/test/SemaHLSL/Semantics/sampleindex.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/sampleindex.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Type, index and interpolation checks for SV_SampleIndex. These are
 // independent of the shader stage and IO direction, which are covered by
 // sampleindex.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/sampleindex.stages.hlsl b/clang/test/SemaHLSL/Semantics/sampleindex.stages.hlsl
index 059328ccaf14e..b9227e12f5365 100644
--- a/clang/test/SemaHLSL/Semantics/sampleindex.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/sampleindex.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_SampleIndex: only a pixel input.
 // Type, index and interpolation checks are covered by sampleindex.ps.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/semantic-64bit-types.hlsl b/clang/test/SemaHLSL/Semantics/semantic-64bit-types.hlsl
index 7fdfc90960706..4e6a641def3e7 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-64bit-types.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-64bit-types.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -fsyntax-only -verify=spirv %s
 // spirv-no-diagnostics
 
+using namespace hlsl;
+
 // DXIL signatures cannot contain 64-bit components. Reject these types rather
 // than attempting to assign extra semantic indices to wide vectors.
 struct Input {
diff --git a/clang/test/SemaHLSL/Semantics/semantic-indexing.hlsl b/clang/test/SemaHLSL/Semantics/semantic-indexing.hlsl
index 06831a63956e8..a7978ed08cd24 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-indexing.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-indexing.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 struct Pair {
   uint A;
   uint B;
diff --git a/clang/test/SemaHLSL/Semantics/semantic-overlap.hlsl b/clang/test/SemaHLSL/Semantics/semantic-overlap.hlsl
index ebda1000c932d..c835017cd7c56 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-overlap.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-overlap.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 struct Collide {
   float4 A : USER0;
 // expected-note at -1 {{previous use is here}}
diff --git a/clang/test/SemaHLSL/Semantics/semantic-stage.vs-ps.hlsl b/clang/test/SemaHLSL/Semantics/semantic-stage.vs-ps.hlsl
index 4a15227b5bc2b..8a5cff34d9153 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-stage.vs-ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-stage.vs-ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 [shader("vertex")]
 uint vs_vertexid_out(uint ID : SV_VertexID) : SV_VertexID { return ID; }
 // expected-error at -1 {{semantic 'SV_VertexID' is not supported in vertex shader outputs}}
diff --git a/clang/test/SemaHLSL/Semantics/semantic-types.hlsl b/clang/test/SemaHLSL/Semantics/semantic-types.hlsl
index d00a036eb38cb..7b6328abeba10 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-types.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-types.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -fnative-half-type -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 [shader("pixel")]
 double4 target_double(float4 P : SV_Position) : SV_Target { return (double4)P; }
 // expected-error at -1 {{semantic 'SV_Target' must be a scalar or vector of up to 4 components of 16 or 32 bit floating-point type (was 'double4' (aka 'vector<double, 4>'))}}
diff --git a/clang/test/SemaHLSL/Semantics/semantic-zero-sized-array.hlsl b/clang/test/SemaHLSL/Semantics/semantic-zero-sized-array.hlsl
index 3805c6c20a837..81c8071736c0d 100644
--- a/clang/test/SemaHLSL/Semantics/semantic-zero-sized-array.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic-zero-sized-array.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 [shader("compute")][numthreads(1,1,1)]
 void empty_input(uint V[0] : SV_GroupIndex) {}
 // expected-error at -1 {{semantic 'SV_GroupIndex' cannot be applied to a zero-sized array}}
diff --git a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-builtin-vs.hlsl b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-builtin-vs.hlsl
index 1c463baa51846..f68bae47cb147 100644
--- a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-builtin-vs.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-builtin-vs.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-vertex -x hlsl -hlsl-entry main1 -emit-llvm -finclude-default-header -disable-llvm-passes -o - %s -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // This is almost the same as semantic.explicit-mix-builtin.hlsl, except this
 // time we build a vertex shader. This means the SV_Position semantic is not
 // a BuiltIn anymore, but a Location decorated variable. This means we mix
diff --git a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location-2.hlsl b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location-2.hlsl
index def7b3ffdc3fc..79f3398cd6a48 100644
--- a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location-2.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location-2.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan1.3-pixel -hlsl-entry main1 %s -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // The following code is not legal: both semantics A and B will be lowered
 // into a Location decoration. And mixing implicit and explicit Location
 // assignment is not supported.
diff --git a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location.hlsl b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location.hlsl
index 1542b090661f3..30200b8101e9e 100644
--- a/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location.hlsl
+++ b/clang/test/SemaHLSL/Semantics/semantic.explicit-mix-location.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan1.3-pixel -hlsl-entry main1 %s -emit-llvm-only -disable-llvm-passes -verify -verify-ignore-unexpected=note
 
+using namespace hlsl;
+
 // The following code is not legal: both semantics A and B will be lowered
 // into a Location decoration. And mixing implicit and explicit Location
 // assignment is not supported.
diff --git a/clang/test/SemaHLSL/Semantics/shadingrate.explicit-location.hlsl b/clang/test/SemaHLSL/Semantics/shadingrate.explicit-location.hlsl
index adc766169964a..89cdd2cb7f328 100644
--- a/clang/test/SemaHLSL/Semantics/shadingrate.explicit-location.hlsl
+++ b/clang/test/SemaHLSL/Semantics/shadingrate.explicit-location.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // SV_ShadingRate lowers to a BuiltIn, not a Location. It must therefore not
 // count towards the explicit/implicit vk::location consistency check or
 // advance the implicit location index.
diff --git a/clang/test/SemaHLSL/Semantics/shadingrate.model.hlsl b/clang/test/SemaHLSL/Semantics/shadingrate.model.hlsl
index 7d95db630ebc3..b09a5b8c06e67 100644
--- a/clang/test/SemaHLSL/Semantics/shadingrate.model.hlsl
+++ b/clang/test/SemaHLSL/Semantics/shadingrate.model.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.4-library -finclude-default-header -x hlsl -verify=ok -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=ok -o - %s
 
+using namespace hlsl;
+
 // SV_ShadingRate requires shader model 6.4 for DXIL.
 // The shader model does not apply to SPIR-V, which is only run to check that no error is emitted.
 // Behavior parity with DXC's hlsl/semantics/sv_shadingrate/shadingrate4.hlsl
diff --git a/clang/test/SemaHLSL/Semantics/shadingrate.ms-as.input.hlsl b/clang/test/SemaHLSL/Semantics/shadingrate.ms-as.input.hlsl
index 2149e9cd86435..c615d4365d04d 100644
--- a/clang/test/SemaHLSL/Semantics/shadingrate.ms-as.input.hlsl
+++ b/clang/test/SemaHLSL/Semantics/shadingrate.ms-as.input.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // SV_ShadingRate is not an input in mesh or amplification shaders
 
 [shader("mesh")]
diff --git a/clang/test/SemaHLSL/Semantics/shadingrate.ps.hlsl b/clang/test/SemaHLSL/Semantics/shadingrate.ps.hlsl
index ee4aaed4d1291..5564a3b57c2e7 100644
--- a/clang/test/SemaHLSL/Semantics/shadingrate.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/shadingrate.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple dxil-pc-shadermodel6.4-library -finclude-default-header -x hlsl -verify=dxil,expected -o - %s
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=spirv,expected -o - %s
 
+using namespace hlsl;
+
 // Type and index checks for SV_ShadingRate. These are independent of the
 // shader stage and IO direction, which are covered by shadingrate.stages.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/shadingrate.stages.hlsl b/clang/test/SemaHLSL/Semantics/shadingrate.stages.hlsl
index ce0c4a3490eca..5e30b420cc4fe 100644
--- a/clang/test/SemaHLSL/Semantics/shadingrate.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/shadingrate.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.4-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_ShadingRate: a vertex output and a pixel input.
 // Type and index checks are covered by shadingrate.ps.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/startinstancelocation.model.hlsl b/clang/test/SemaHLSL/Semantics/startinstancelocation.model.hlsl
index 52473aed4ad85..fa529690d0b3a 100644
--- a/clang/test/SemaHLSL/Semantics/startinstancelocation.model.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startinstancelocation.model.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -finclude-default-header -x hlsl -verify=ok -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=ok -o - %s
 
+using namespace hlsl;
+
 // SV_StartInstanceLocation requires shader model 6.8 for DXIL.
 // The shader model restriction does not apply to SPIR-V, which is only run to check that no error is emitted.
 
diff --git a/clang/test/SemaHLSL/Semantics/startinstancelocation.stages.hlsl b/clang/test/SemaHLSL/Semantics/startinstancelocation.stages.hlsl
index 7ae351bd1d65f..6a448af5f3f5f 100644
--- a/clang/test/SemaHLSL/Semantics/startinstancelocation.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startinstancelocation.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_StartInstanceLocation: only a vertex input.
 // Type and index checks are covered by startinstancelocation.vs.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/startinstancelocation.vs.hlsl b/clang/test/SemaHLSL/Semantics/startinstancelocation.vs.hlsl
index 37d9328b7897a..ef2a16e9f9f64 100644
--- a/clang/test/SemaHLSL/Semantics/startinstancelocation.vs.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startinstancelocation.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Type and index checks for SV_StartInstanceLocation. These are independent of
 // the shader stage and IO direction, which are covered by
 // startinstancelocation.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/startvertexlocation.model.hlsl b/clang/test/SemaHLSL/Semantics/startvertexlocation.model.hlsl
index 559c960af5398..2e7df52b5c085 100644
--- a/clang/test/SemaHLSL/Semantics/startvertexlocation.model.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startvertexlocation.model.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -finclude-default-header -x hlsl -verify=ok -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=ok -o - %s
 
+using namespace hlsl;
+
 // SV_StartVertexLocation requires shader model 6.8 for DXIL.
 // The shader model restriction does not apply to SPIR-V, which is only run to check that no error is emitted.
 
diff --git a/clang/test/SemaHLSL/Semantics/startvertexlocation.stages.hlsl b/clang/test/SemaHLSL/Semantics/startvertexlocation.stages.hlsl
index d51b1c5a24670..821ba0ef3e99b 100644
--- a/clang/test/SemaHLSL/Semantics/startvertexlocation.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startvertexlocation.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_StartVertexLocation: only a vertex input.
 // Type and index checks are covered by startvertexlocation.vs.hlsl.
 
diff --git a/clang/test/SemaHLSL/Semantics/startvertexlocation.vs.hlsl b/clang/test/SemaHLSL/Semantics/startvertexlocation.vs.hlsl
index 96ed10524999e..670a0cc1316e8 100644
--- a/clang/test/SemaHLSL/Semantics/startvertexlocation.vs.hlsl
+++ b/clang/test/SemaHLSL/Semantics/startvertexlocation.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.8-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Type and index checks for SV_StartVertexLocation. These are independent of
 // the shader stage and IO direction, which are covered by
 // startvertexlocation.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/struct_input.hlsl b/clang/test/SemaHLSL/Semantics/struct_input.hlsl
index 66cab9552d4d9..6a2374abd9413 100644
--- a/clang/test/SemaHLSL/Semantics/struct_input.hlsl
+++ b/clang/test/SemaHLSL/Semantics/struct_input.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -x hlsl -finclude-default-header -o - %s -verify
 
+using namespace hlsl;
+
 struct S {
   float4 f0 : SV_Position;
 // expected-error at +2 {{semantic annotations must be present for all parameters of an entry function or patch constant function}}
diff --git a/clang/test/SemaHLSL/Semantics/target.index.hlsl b/clang/test/SemaHLSL/Semantics/target.index.hlsl
index 712276caf9729..8ddcc1a2288ea 100644
--- a/clang/test/SemaHLSL/Semantics/target.index.hlsl
+++ b/clang/test/SemaHLSL/Semantics/target.index.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // SV_Target indices select one of eight render target slots.
 [shader("pixel")]
 float4 target_zero(float4 P : SV_Position) : SV_Target { return P; }
diff --git a/clang/test/SemaHLSL/Semantics/target.ps.input.hlsl b/clang/test/SemaHLSL/Semantics/target.ps.input.hlsl
index b2ea8e2721877..9a86cf4db3ba4 100644
--- a/clang/test/SemaHLSL/Semantics/target.ps.input.hlsl
+++ b/clang/test/SemaHLSL/Semantics/target.ps.input.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(float4 a : SV_Target) : SV_Target {
 // expected-error at -1 {{semantic 'SV_Target' is not supported in pixel shader inputs}}
   return a;
diff --git a/clang/test/SemaHLSL/Semantics/target.vs.input.hlsl b/clang/test/SemaHLSL/Semantics/target.vs.input.hlsl
index 2e9b54810ba81..9ef79b5ea4429 100644
--- a/clang/test/SemaHLSL/Semantics/target.vs.input.hlsl
+++ b/clang/test/SemaHLSL/Semantics/target.vs.input.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-vertex -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(float4 a : SV_Target) : A {
 // expected-error at -1 {{semantic 'SV_Target' is not supported in vertex shader inputs}}
   return a;
diff --git a/clang/test/SemaHLSL/Semantics/target.vs.output.hlsl b/clang/test/SemaHLSL/Semantics/target.vs.output.hlsl
index 811d597f182ae..c0568413c387c 100644
--- a/clang/test/SemaHLSL/Semantics/target.vs.output.hlsl
+++ b/clang/test/SemaHLSL/Semantics/target.vs.output.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-vertex -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-vertex -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(float4 a : SV_Position) : SV_Target {
 // expected-error at -1 {{semantic 'SV_Target' is not supported in vertex shader outputs}}
   return a;
diff --git a/clang/test/SemaHLSL/Semantics/valid_entry_parameter.hlsl b/clang/test/SemaHLSL/Semantics/valid_entry_parameter.hlsl
index 0fc60b308a159..7990626ac9c3e 100644
--- a/clang/test/SemaHLSL/Semantics/valid_entry_parameter.hlsl
+++ b/clang/test/SemaHLSL/Semantics/valid_entry_parameter.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-compute -x hlsl -hlsl-entry CSMain -finclude-default-header -ast-dump  -o - %s | FileCheck %s
 
+using namespace hlsl;
+
 [numthreads(8,8,1)]
 void CSMain(uint ID : SV_DispatchThreadID) {
 // CHECK: FunctionDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> line:[[@LINE-1]]:6 CSMain 'void (uint)'
diff --git a/clang/test/SemaHLSL/Semantics/vertexid.ps.hlsl b/clang/test/SemaHLSL/Semantics/vertexid.ps.hlsl
index 8d44655c9e1d2..da9a565623aef 100644
--- a/clang/test/SemaHLSL/Semantics/vertexid.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/vertexid.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-pixel -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 float4 main(uint id : SV_VertexID) : SV_Target {
 // expected-error at -1 {{semantic 'SV_VertexID' is not supported in pixel shader inputs}}
   return float4(1, 1, 1, 1);
diff --git a/clang/test/SemaHLSL/Semantics/vertexid.vs.hlsl b/clang/test/SemaHLSL/Semantics/vertexid.vs.hlsl
index 7a104baeab06e..b54adc100aee1 100644
--- a/clang/test/SemaHLSL/Semantics/vertexid.vs.hlsl
+++ b/clang/test/SemaHLSL/Semantics/vertexid.vs.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple dxil-pc-shadermodel6.3-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -fnative-half-type -fnative-int16-type -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // SV_VertexID accepts 16- and 32-bit signed or unsigned scalars.
 
 [shader("vertex")]
diff --git a/clang/test/SemaHLSL/Semantics/viewid.model.hlsl b/clang/test/SemaHLSL/Semantics/viewid.model.hlsl
index 13fd02eb141e4..b795492fa561f 100644
--- a/clang/test/SemaHLSL/Semantics/viewid.model.hlsl
+++ b/clang/test/SemaHLSL/Semantics/viewid.model.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.2-library -finclude-default-header -x hlsl -verify=ok -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify=ok -o - %s
 
+using namespace hlsl;
+
 // SV_ViewID requires shader model 6.1 for DXIL.
 // For SPIR-V, SV_ViewID is the ViewIndex built-in, which requires the
 // MultiView capability. MultiView is core from Vulkan 1.1, and Clang only
diff --git a/clang/test/SemaHLSL/Semantics/viewid.ps.errors.hlsl b/clang/test/SemaHLSL/Semantics/viewid.ps.errors.hlsl
index 1a314c4fa9aa6..05561795fa9e5 100644
--- a/clang/test/SemaHLSL/Semantics/viewid.ps.errors.hlsl
+++ b/clang/test/SemaHLSL/Semantics/viewid.ps.errors.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Invalid type, index and interpolation uses of SV_ViewID. The valid cases are
 // covered by viewid.ps.hlsl, and the shader stage and IO direction by
 // viewid.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/viewid.ps.hlsl b/clang/test/SemaHLSL/Semantics/viewid.ps.hlsl
index 0f1eb43c2d969..1fa482888ed66 100644
--- a/clang/test/SemaHLSL/Semantics/viewid.ps.hlsl
+++ b/clang/test/SemaHLSL/Semantics/viewid.ps.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -fnative-half-type -fnative-int16-type -finclude-default-header -fsyntax-only -verify %s
 
+using namespace hlsl;
+
 // Valid type, index and interpolation uses of SV_ViewID. The invalid cases are
 // covered by viewid.ps.errors.hlsl, and the shader stage and IO direction by
 // viewid.stages.hlsl.
diff --git a/clang/test/SemaHLSL/Semantics/viewid.stages.hlsl b/clang/test/SemaHLSL/Semantics/viewid.stages.hlsl
index d2e2b596ae6e7..627fddf08a757 100644
--- a/clang/test/SemaHLSL/Semantics/viewid.stages.hlsl
+++ b/clang/test/SemaHLSL/Semantics/viewid.stages.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.2-library -finclude-default-header -x hlsl -verify -o - %s
 // RUN: %clang_cc1 -triple spirv-pc-vulkan1.3-library -finclude-default-header -x hlsl -verify -o - %s
 
+using namespace hlsl;
+
 // Stage and IO direction checks for SV_ViewID: an input to every graphics
 // stage except amplification shaders. Type, index and interpolation checks are
 // covered by viewid.ps.hlsl and viewid.ps.errors.hlsl.
diff --git a/clang/test/SemaHLSL/SplatOverloadResolution.hlsl b/clang/test/SemaHLSL/SplatOverloadResolution.hlsl
index 0d9fb043dab59..f9f42fbd7b595 100644
--- a/clang/test/SemaHLSL/SplatOverloadResolution.hlsl
+++ b/clang/test/SemaHLSL/SplatOverloadResolution.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -fsyntax-only %s -DERROR=1 -verify
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 
 // Case 1: Prioritize splat without conversion over conversion. In this case the
 // called functions have valid overloads for each type, however one of the
diff --git a/clang/test/SemaHLSL/TruncationOverloadResolution.hlsl b/clang/test/SemaHLSL/TruncationOverloadResolution.hlsl
index f6f5c1f261ed9..1c6f16bcd92bc 100644
--- a/clang/test/SemaHLSL/TruncationOverloadResolution.hlsl
+++ b/clang/test/SemaHLSL/TruncationOverloadResolution.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -fsyntax-only %s -DERROR=1 -verify
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 // Case 1: Prefer conversion over exact match truncation.
 
 void Half4Float2(float2 D);
diff --git a/clang/test/SemaHLSL/Types/AggregateSplatConstantExpr.hlsl b/clang/test/SemaHLSL/Types/AggregateSplatConstantExpr.hlsl
index b8eab5c00e581..6f2fe11ab9db5 100644
--- a/clang/test/SemaHLSL/Types/AggregateSplatConstantExpr.hlsl
+++ b/clang/test/SemaHLSL/Types/AggregateSplatConstantExpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fnative-int16-type -std=hlsl202x -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fnative-int16-type -std=hlsl202x -fexperimental-new-constant-interpreter -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 struct Base {
diff --git a/clang/test/SemaHLSL/Types/Arithmetic/literal_suffixes_202x.hlsl b/clang/test/SemaHLSL/Types/Arithmetic/literal_suffixes_202x.hlsl
index 9dd523494b60e..7b3d0d6366304 100644
--- a/clang/test/SemaHLSL/Types/Arithmetic/literal_suffixes_202x.hlsl
+++ b/clang/test/SemaHLSL/Types/Arithmetic/literal_suffixes_202x.hlsl
@@ -7,6 +7,8 @@
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -finclude-default-header -fexperimental-new-constant-interpreter -verify %s
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -finclude-default-header -fexperimental-new-constant-interpreter -verify -fnative-half-type %s
 
+using namespace hlsl;
+
 // This test is adapted from the test in DXC:
 // tools/clang/test/SemaHLSL/v202x/conforming-literals/valid-literals.hlsl
 
diff --git a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixCastErrors.hlsl b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixCastErrors.hlsl
index 59d432cd3eb00..c3dc6184ddf39 100644
--- a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixCastErrors.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixCastErrors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -verify %s
 
+using namespace hlsl;
+
 // Note column is too large
 export int3x2 shape_cast_error(float2x3 f23) {
     int3x2 i32 = (int3x2)f23;
diff --git a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixConstantExpr.hlsl b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixConstantExpr.hlsl
index 2c55e1a0ee4b3..00071ece5bc1b 100644
--- a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixConstantExpr.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixConstantExpr.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -fmatrix-memory-layout=column-major -fexperimental-new-constant-interpreter -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -fmatrix-memory-layout=row-major -fexperimental-new-constant-interpreter -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Matrix subscripting is not currently supported with matrix constexpr. So all
diff --git a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixFloatPrecisionWarnings.hlsl b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixFloatPrecisionWarnings.hlsl
index ba5faaf7688ab..370cb1141a204 100644
--- a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixFloatPrecisionWarnings.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixFloatPrecisionWarnings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -Wconversion -verify %s
 
+using namespace hlsl;
+
 // This test verifies that the implicit conversion warning for floating-point
 // precision loss works correctly for matrix types. The IsSameFloatAfterCast
 // function is used to suppress warnings for constant values that are exactly
diff --git a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixImplicitTruncCastWarnings.hlsl b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixImplicitTruncCastWarnings.hlsl
index 6ac3feeb1ea03..25d0316e9f7f4 100644
--- a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixImplicitTruncCastWarnings.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixImplicitTruncCastWarnings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 export int3x4 trunc_cast(int4x4 i44) {
     int3x4 i34 = i44;
     // expected-warning at -1{{implicit conversion truncates matrix: 'int4x4' (aka 'matrix<int, 4, 4>') to 'int3x4' (aka 'matrix<int, 3, 4>')}}
diff --git a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixSplatErrors.hlsl b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixSplatErrors.hlsl
index fc3f8e7adc050..0906c40b50274 100644
--- a/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixSplatErrors.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinMatrix/MatrixSplatErrors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -verify %s
 
+using namespace hlsl;
+
 void SplatOfUndersizedVectortoMat(int3 V){
     int2x2 M = V;
     // expected-error at -1 {{too few initializers in list for type 'int2x2' (aka 'matrix<int, 2, 2>') (expected 4 but found 3)}}
diff --git a/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzleErrors.hlsl b/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzleErrors.hlsl
index a2c0a8fa69822..481812bd2feec 100644
--- a/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzleErrors.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzleErrors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 int2 ToTwoInts(int V) {
   return V.xy; // expected-error{{vector component access exceeds type 'vector<int, 1>' (vector of 1 'int' value)}}
 }
diff --git a/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzles.hlsl b/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzles.hlsl
index 78ff54987a5bf..a08802c013b3f 100644
--- a/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzles.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinVector/ScalarSwizzles.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library  -x hlsl \
 // RUN:   -finclude-default-header -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 
 // CHECK-LABEL: ToTwoInts
 // CHECK: ExtVectorElementExpr {{.*}} 'vector<int, 2>' xx
diff --git a/clang/test/SemaHLSL/Types/BuiltinVector/TruncationConstantExpr.hlsl b/clang/test/SemaHLSL/Types/BuiltinVector/TruncationConstantExpr.hlsl
index 272c0a26ccf0c..b46eb09abab74 100644
--- a/clang/test/SemaHLSL/Types/BuiltinVector/TruncationConstantExpr.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinVector/TruncationConstantExpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -fexperimental-new-constant-interpreter -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Note: these tests are a bit awkward because at time of writing we don't have a
diff --git a/clang/test/SemaHLSL/Types/BuiltinVector/VectorCastConstantExpr.hlsl b/clang/test/SemaHLSL/Types/BuiltinVector/VectorCastConstantExpr.hlsl
index a2fee7f80ec08..4a9dffad0320a 100644
--- a/clang/test/SemaHLSL/Types/BuiltinVector/VectorCastConstantExpr.hlsl
+++ b/clang/test/SemaHLSL/Types/BuiltinVector/VectorCastConstantExpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -fexperimental-new-constant-interpreter -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 // Tests for constexpr evaluation of element-wise vector casts.
diff --git a/clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl b/clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl
index 2b9c6e69e9c24..6dc3733b303c2 100644
--- a/clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl
+++ b/clang/test/SemaHLSL/Types/ElementwiseCastConstantExpr.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fnative-int16-type -std=hlsl202x -verify %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fnative-int16-type -std=hlsl202x -fexperimental-new-constant-interpreter -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 struct Base {
diff --git a/clang/test/SemaHLSL/Types/Traits/IsIntangibleType.hlsl b/clang/test/SemaHLSL/Types/Traits/IsIntangibleType.hlsl
index cb1a7cbd42c24..48ca083c12524 100644
--- a/clang/test/SemaHLSL/Types/Traits/IsIntangibleType.hlsl
+++ b/clang/test/SemaHLSL/Types/Traits/IsIntangibleType.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fexperimental-new-constant-interpreter -verify %s
 // expected-no-diagnostics
 
+using namespace hlsl;
+
 _Static_assert(__builtin_hlsl_is_intangible(__hlsl_resource_t), "");
 // no need to check array of __hlsl_resource_t, arrays of sizeless types are not supported
 
diff --git a/clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl b/clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl
index dcc6ca2163a79..413d0882e2afd 100644
--- a/clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl
+++ b/clang/test/SemaHLSL/Types/Traits/IsTypedResourceElementCompatible.hlsl
@@ -2,6 +2,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fexperimental-new-constant-interpreter -verify %s
 // expected-no-diagnostics
 
+using namespace hlsl;
+
 
 _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(int), "");
 _Static_assert(__builtin_hlsl_is_typed_resource_element_compatible(float), "");
diff --git a/clang/test/SemaHLSL/Types/Traits/ScalarizedLayoutCompatible.hlsl b/clang/test/SemaHLSL/Types/Traits/ScalarizedLayoutCompatible.hlsl
index 932d2a9ad0dd7..9cb0dd44d2d84 100644
--- a/clang/test/SemaHLSL/Types/Traits/ScalarizedLayoutCompatible.hlsl
+++ b/clang/test/SemaHLSL/Types/Traits/ScalarizedLayoutCompatible.hlsl
@@ -4,6 +4,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -fnative-half-type -fexperimental-new-constant-interpreter -verify %s
 // expected-no-diagnostics
 
+using namespace hlsl;
+
 // Case 1: How many ways can I come up with to represent three float values?
 struct ThreeFloats1 {
   float X, Y, Z;
diff --git a/clang/test/SemaHLSL/Types/invalid-longvec-swizzle.hlsl b/clang/test/SemaHLSL/Types/invalid-longvec-swizzle.hlsl
index e8eb88af8e877..39107efb28c29 100644
--- a/clang/test/SemaHLSL/Types/invalid-longvec-swizzle.hlsl
+++ b/clang/test/SemaHLSL/Types/invalid-longvec-swizzle.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 export vector<double, 3> test_parameter(vector<double, 5> vec5) {
   vec5.x = 1; // expected-error {{invalid swizzle 'x' on vector of over 4 elements}}
   return vec5.xyw; // expected-error {{invalid swizzle 'xyw' on vector of over 4 elements}}
diff --git a/clang/test/SemaHLSL/Types/packed-types-error.hlsl b/clang/test/SemaHLSL/Types/packed-types-error.hlsl
index 2a4cb256c5a56..e6447a485864f 100644
--- a/clang/test/SemaHLSL/Types/packed-types-error.hlsl
+++ b/clang/test/SemaHLSL/Types/packed-types-error.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -fsyntax-only -verify -triple dxil-unknown-shadermodel6.6-library %s
 
+using namespace hlsl;
+
 typedef float int8_t4_packed; // expected-error {{cannot combine with previous 'float' declaration specifier}} expected-warning {{typedef requires a name}}
 typedef float uint8_t4_packed; // expected-error {{cannot combine with previous 'float' declaration specifier}} expected-warning {{typedef requires a name}}
 
diff --git a/clang/test/SemaHLSL/Types/typedefs.hlsl b/clang/test/SemaHLSL/Types/typedefs.hlsl
index 36d65324f0d8e..2552ec03a233e 100644
--- a/clang/test/SemaHLSL/Types/typedefs.hlsl
+++ b/clang/test/SemaHLSL/Types/typedefs.hlsl
@@ -3,6 +3,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.4-library -finclude-default-header -fexperimental-new-constant-interpreter -verify -fnative-half-type -fnative-int16-type %s
 // RUN: %clang_cc1 -triple spirv-linux-vulkan-library -finclude-default-header -fexperimental-new-constant-interpreter -verify -fnative-half-type -fnative-int16-type %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 #define SizeCheck(Ty, SizeInBits)                                              \
   _Static_assert(sizeof(Ty) == SizeInBits / 8, #Ty " is " #SizeInBits "-bit"); \
diff --git a/clang/test/SemaHLSL/VectorElementOverloadResolution.hlsl b/clang/test/SemaHLSL/VectorElementOverloadResolution.hlsl
index 9ed33aa2d58b7..8cc79d49af8d4 100644
--- a/clang/test/SemaHLSL/VectorElementOverloadResolution.hlsl
+++ b/clang/test/SemaHLSL/VectorElementOverloadResolution.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -verify -o - %s -DERROR=1
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -fnative-half-type -finclude-default-header -Wno-conversion -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 // This test verifies floating point type implicit conversion ranks for overload
 // resolution. In HLSL the built-in type ranks are half < float < double. This
 // applies to both scalar and vector types.
diff --git a/clang/test/SemaHLSL/VectorOverloadResolution.hlsl b/clang/test/SemaHLSL/VectorOverloadResolution.hlsl
index 86a30f8c5f73c..ce26043d70972 100644
--- a/clang/test/SemaHLSL/VectorOverloadResolution.hlsl
+++ b/clang/test/SemaHLSL/VectorOverloadResolution.hlsl
@@ -1,5 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-unknown-shadermodel6.6-library -S -fnative-half-type -fnative-int16-type -finclude-default-header -o - -ast-dump %s | FileCheck %s
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.6-library %s -fnative-half-type -fnative-int16-type -emit-llvm -disable-llvm-passes -o - | FileCheck %s --check-prefixes=CHECKIR
+
+using namespace hlsl;
+
 void Fn(double2 D);
 void Fn(half2 H);
 
diff --git a/clang/test/SemaHLSL/inline-spirv/SpirvType.incomplete.hlsl b/clang/test/SemaHLSL/inline-spirv/SpirvType.incomplete.hlsl
index 5980023ac6086..0f3ad5b33f4cd 100644
--- a/clang/test/SemaHLSL/inline-spirv/SpirvType.incomplete.hlsl
+++ b/clang/test/SemaHLSL/inline-spirv/SpirvType.incomplete.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-compute %s -fsyntax-only -verify
 
+using namespace hlsl;
+
 struct S; // expected-note {{forward declaration of 'S'}}
 
 // expected-error at hlsl/hlsl_spirv.h:24 {{argument type 'S' is incomplete}}
diff --git a/clang/test/SemaHLSL/inline-spirv/SpirvType.literal.error.hlsl b/clang/test/SemaHLSL/inline-spirv/SpirvType.literal.error.hlsl
index 331f19a427384..927399c41913a 100644
--- a/clang/test/SemaHLSL/inline-spirv/SpirvType.literal.error.hlsl
+++ b/clang/test/SemaHLSL/inline-spirv/SpirvType.literal.error.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple \
 // RUN:   spirv-unknown-vulkan-compute %s -fsyntax-only -verify
 
+using namespace hlsl;
+
 // expected-error at hlsl/hlsl_spirv.h:18 {{the argument to vk::Literal must be a vk::integral_constant}}
 
 typedef vk::SpirvOpaqueType<28, vk::Literal<float>> T; // #1
diff --git a/clang/test/SemaHLSL/interpolation-modifiers-vertex.hlsl b/clang/test/SemaHLSL/interpolation-modifiers-vertex.hlsl
index 997aef970d84f..c79306dace873 100644
--- a/clang/test/SemaHLSL/interpolation-modifiers-vertex.hlsl
+++ b/clang/test/SemaHLSL/interpolation-modifiers-vertex.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 // Vertex return declarations have the same interpolation restrictions as pixel
 // inputs. Check the return type, not the function type.
 [shader("vertex")]
diff --git a/clang/test/SemaHLSL/interpolation-modifiers.hlsl b/clang/test/SemaHLSL/interpolation-modifiers.hlsl
index 80f2e33b7a9c8..b8ff40e00ad91 100644
--- a/clang/test/SemaHLSL/interpolation-modifiers.hlsl
+++ b/clang/test/SemaHLSL/interpolation-modifiers.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 // Each keyword is incompatible with nointerpolation, in either order.
 void conflicts(
     // expected-error at +2 {{'nointerpolation' cannot be combined}}
diff --git a/clang/test/SemaHLSL/matrix-member-access-errors.hlsl b/clang/test/SemaHLSL/matrix-member-access-errors.hlsl
index b604823f8fd73..e31eb1f35145c 100644
--- a/clang/test/SemaHLSL/matrix-member-access-errors.hlsl
+++ b/clang/test/SemaHLSL/matrix-member-access-errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 typedef vector<float, 5> float5;
 
 void foo() {
diff --git a/clang/test/SemaHLSL/matrix_layout_attr.hlsl b/clang/test/SemaHLSL/matrix_layout_attr.hlsl
index c17c4364ec512..6fc8f317b82af 100644
--- a/clang/test/SemaHLSL/matrix_layout_attr.hlsl
+++ b/clang/test/SemaHLSL/matrix_layout_attr.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.6-library -finclude-default-header -std=hlsl202x -verify %s
 
+using namespace hlsl;
+
 // Valid: row_major and column_major on matrix types.
 row_major float3x3 rm_mat;
 column_major float4x4 cm_mat;
diff --git a/clang/test/SemaHLSL/matrix_single_subscript_errors.hlsl b/clang/test/SemaHLSL/matrix_single_subscript_errors.hlsl
index 256a71eb72167..754dbd8aaa21f 100644
--- a/clang/test/SemaHLSL/matrix_single_subscript_errors.hlsl
+++ b/clang/test/SemaHLSL/matrix_single_subscript_errors.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.4-library -finclude-default-header -verify %s
 
+using namespace hlsl;
+
 float2x3 gM;
 
 void bad_index_type(float f) {
diff --git a/clang/test/SemaHLSL/no-conversion-warnings.hlsl b/clang/test/SemaHLSL/no-conversion-warnings.hlsl
index abee35f9aa8dc..94c2e73ac9a2f 100644
--- a/clang/test/SemaHLSL/no-conversion-warnings.hlsl
+++ b/clang/test/SemaHLSL/no-conversion-warnings.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -finclude-default-header -x hlsl -triple dxil-pc-shadermodel6.3-library -Wno-conversion -Wno-vector-conversion -Wno-matrix-conversion -verify %s
 
+using namespace hlsl;
+
 // expected-no-diagnostics
 
 void test() {
diff --git a/clang/test/SemaHLSL/standard_conversion_sequences.hlsl b/clang/test/SemaHLSL/standard_conversion_sequences.hlsl
index 48772cfd36335..bba158b5e028f 100644
--- a/clang/test/SemaHLSL/standard_conversion_sequences.hlsl
+++ b/clang/test/SemaHLSL/standard_conversion_sequences.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -verify -o - %s
 // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -Wno-conversion -DNO_ERR -ast-dump %s | FileCheck %s
 
+using namespace hlsl;
+
 void test() {
 
   // CHECK: VarDecl {{.*}} used f3 'vector<float, 3>' cinit
diff --git a/clang/test/SemaHLSL/vk-ext-input-builtin.hlsl b/clang/test/SemaHLSL/vk-ext-input-builtin.hlsl
index bc49fc7cabeb4..8413e6574ce73 100644
--- a/clang/test/SemaHLSL/vk-ext-input-builtin.hlsl
+++ b/clang/test/SemaHLSL/vk-ext-input-builtin.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-unkown-vulkan1.3-compute -x hlsl -hlsl-entry foo  -finclude-default-header -o - %s -verify
 
+using namespace hlsl;
+
 // expected-error at +1 {{'vk::ext_builtin_input' attribute only applies to static const globals}}
 [[vk::ext_builtin_input(/* WorkgroupId */ 26)]]
 const uint3 groupid1;
diff --git a/clang/test/SemaHLSL/vk-ext-output-builtin.hlsl b/clang/test/SemaHLSL/vk-ext-output-builtin.hlsl
index bfe0ce3067043..1cbc3c189a569 100644
--- a/clang/test/SemaHLSL/vk-ext-output-builtin.hlsl
+++ b/clang/test/SemaHLSL/vk-ext-output-builtin.hlsl
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple spirv-unknown-vulkan1.3-compute -x hlsl -hlsl-entry foo  -finclude-default-header -o - %s -verify
 
+using namespace hlsl;
+
 // expected-error at +1 {{'vk::ext_builtin_output' attribute only applies to non-const static globals}}
 [[vk::ext_builtin_output(/* Position */ 0)]]
 float4 position0;
diff --git a/clang/test/SemaHLSL/vk.spec-constant.error.hlsl b/clang/test/SemaHLSL/vk.spec-constant.error.hlsl
index 0049a67ce06e6..9600362947415 100644
--- a/clang/test/SemaHLSL/vk.spec-constant.error.hlsl
+++ b/clang/test/SemaHLSL/vk.spec-constant.error.hlsl
@@ -1,6 +1,8 @@
 // RUN: %clang_cc1 -finclude-default-header -triple spirv-pc-vulkan1.3-compute -verify %s
 // RUN: %clang_cc1 -finclude-default-header -triple dxil-pc-shadermodel6.8-library -verify %s
 
+using namespace hlsl;
+
 #ifndef __spirv__
 // expected-warning at +2{{'vk::constant_id' attribute ignored}}
 #endif

>From f4feb0f65b0a184f6534daaf941eb6f3e9003d4c Mon Sep 17 00:00:00 2001
From: Sarah Spall <sarahspall at microsoft.com>
Date: Thu, 12 Nov 2026 09:42:31 -0800
Subject: [PATCH 2/4] update test to verify usingnamespacedecl isn't there for
 202x and later

---
 .../AST/HLSL/implicit-using-namespace.hlsl    | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/clang/test/AST/HLSL/implicit-using-namespace.hlsl b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
index e80219e815c3c..3f8d74bc7ad9b 100644
--- a/clang/test/AST/HLSL/implicit-using-namespace.hlsl
+++ b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
@@ -1,9 +1,19 @@
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2015 -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2016 -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2017 -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2018 -ast-dump %s | FileCheck %s
-// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2021 -ast-dump %s | FileCheck %s
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2015 -ast-dump %s | FileCheck %s --check-prefix=EARLIER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2016 -ast-dump %s | FileCheck %s --check-prefix=EARLIER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2017 -ast-dump %s | FileCheck %s --check-prefix=EARLIER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2018 -ast-dump %s | FileCheck %s --check-prefix=EARLIER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl2021 -ast-dump %s | FileCheck %s --check-prefix=EARLIER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl202x -DLATER -ast-dump %s | FileCheck %s --check-prefix=LATER
+// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.0-library -std=hlsl202y -DLATER -ast-dump %s | FileCheck %s --check-prefix=LATER
 
-// CHECK: UsingDirectiveDecl {{.*}} <<invalid sloc>> <invalid sloc> Namespace {{.*}} 'hlsl'
-// CHECK: ParmVarDecl {{.*}} Value 'vector<float, 2>'
+// LATER-NOT: UsingDirectiveDecl {{.*}} Namespace {{.*}} 'hlsl'
+// LATER: ParmVarDecl {{.*}} Value 'hlsl::vector<float, 2>'
+
+// EARLIER: UsingDirectiveDecl {{.*}} <<invalid sloc>> <invalid sloc> Namespace {{.*}} 'hlsl'
+// EARLIER: ParmVarDecl {{.*}} Value 'vector<float, 2>'
+
+#ifdef LATER
+void test(hlsl::vector<float, 2> Value);
+#else
 void test(vector<float, 2> Value);
+#endif
\ No newline at end of file

>From bb147b3e21d99d9c5ecb80a09dc6c7f9a5b40b0a Mon Sep 17 00:00:00 2001
From: Sarah Spall <sarahspall at microsoft.com>
Date: Thu, 12 Nov 2026 09:54:15 -0800
Subject: [PATCH 3/4] stop matching line and col numbers on some tests as
 suggested

---
 clang/test/AST/HLSL/ast-dump-SpirvType.hlsl      | 16 ++++++++--------
 clang/test/AST/HLSL/matrix-alias.hlsl            | 16 ++++++++--------
 clang/test/AST/HLSL/pch_spirv_type.hlsl          | 10 +++++-----
 .../SemaHLSL/Semantics/position.ps.struct.hlsl   | 16 ++++++++--------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl b/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
index c115117c136d2..1520daeb71baf 100644
--- a/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
+++ b/clang/test/AST/HLSL/ast-dump-SpirvType.hlsl
@@ -2,28 +2,28 @@
 
 using namespace hlsl;
 
-// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:6:1, col:83> col:83 referenced AType 'vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK: TypedefDecl 0x{{.+}} {{.*}} referenced AType 'vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 typedef vk::SpirvOpaqueType<123, RWBuffer<float>, vk::integral_constant<uint, 4>> AType;
-// CHECK: TypedefDecl 0x{{.+}} <{{.+}}:8:1, col:133> col:133 referenced BType 'vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 4886718345L>, float, vk::Literal<vk::integral_constant<uint, 456>>>':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
+// CHECK: TypedefDecl 0x{{.+}} {{.*}} referenced BType 'vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 4886718345L>, float, vk::Literal<vk::integral_constant<uint, 456>>>':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
 typedef vk::SpirvType<12, 2, 4, vk::integral_constant<uint64_t, 0x123456789>, float, vk::Literal<vk::integral_constant<uint, 456>>> BType;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:11:1, col:7> col:7 AValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK: VarDecl 0x{{.+}} {{.*}} AValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 AType AValue;
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:13:1, col:7> col:7 BValue 'BType':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
+// CHECK: VarDecl 0x{{.+}} {{.*}} BValue 'BType':'__hlsl_spirv_type<12, 2, 4, vk::integral_constant<unsigned long, 4886718345>, float, vk::Literal<vk::integral_constant<uint, 456>>>'
 BType BValue;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:16:1, col:80> col:80 CValue 'vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 305419896>>>':'__hlsl_spirv_type<123, 0, 0, vk::Literal<vk::integral_constant<uint, 305419896>>>'
+// CHECK: VarDecl 0x{{.+}} {{.*}} CValue 'vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 305419896>>>':'__hlsl_spirv_type<123, 0, 0, vk::Literal<vk::integral_constant<uint, 305419896>>>'
 vk::SpirvOpaqueType<123, vk::Literal<vk::integral_constant<uint, 0x12345678>>> CValue;
 
-// CHECK: TypeAliasDecl 0x{{.+}} <{{.+}}:20:1, col:72> col:7 referenced Array 'vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>':'__hlsl_spirv_type<28U, 0, 0, T, vk::integral_constant<uint, L>>'
+// CHECK: TypeAliasDecl 0x{{.+}} {{.*}} referenced Array 'vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>':'__hlsl_spirv_type<28U, 0, 0, T, vk::integral_constant<uint, L>>'
 template <class T, uint L>
 using Array = vk::SpirvOpaqueType<28, T, vk::integral_constant<uint, L>>;
 
-// CHECK: VarDecl 0x{{.+}} <{{.+}}:23:1, col:16> col:16 DValue 'Array<uint, 5>':'__hlsl_spirv_type<28, 0, 0, uint, vk::integral_constant<unsigned int, 5>>'
+// CHECK: VarDecl 0x{{.+}} {{.*}} DValue 'Array<uint, 5>':'__hlsl_spirv_type<28, 0, 0, uint, vk::integral_constant<unsigned int, 5>>'
 Array<uint, 5> DValue;
 
 [numthreads(1, 1, 1)]
 void main() {
-// CHECK: VarDecl 0x{{.+}} <col:5, col:11> col:11 EValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK: VarDecl 0x{{.+}} {{.*}} EValue 'AType':'__hlsl_spirv_type<123, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
     AType EValue;
 }
diff --git a/clang/test/AST/HLSL/matrix-alias.hlsl b/clang/test/AST/HLSL/matrix-alias.hlsl
index 78e51f1653ae9..fc095c857f21e 100644
--- a/clang/test/AST/HLSL/matrix-alias.hlsl
+++ b/clang/test/AST/HLSL/matrix-alias.hlsl
@@ -27,25 +27,25 @@ void entry() {
   // Verify that the alias is generated inside the hlsl namespace.
   hlsl::matrix<float, 2, 2> Mat2x2f;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:28:3, col:36>
-  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:29> col:29 Mat2x2f 'hlsl::matrix<float, 2, 2>'
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} {{.*}}
+  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} {{.*}} Mat2x2f 'hlsl::matrix<float, 2, 2>'
 
   // Verify that you don't need to specify the namespace.
   matrix<int, 2, 2> Mat2x2i;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:34:3, col:28>
-  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:21> col:21 Mat2x2i 'matrix<int, 2, 2>'
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} {{.*}}
+  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} {{.*}} Mat2x2i 'matrix<int, 2, 2>'
 
   // Build a bigger matrix.
   matrix<double, 4, 4> Mat4x4d;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:40:3, col:31>
-  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:24> col:24 Mat4x4d 'matrix<double, 4, 4>'
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} {{.*}}
+  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} {{.*}} Mat4x4d 'matrix<double, 4, 4>'
 
   // Verify that the implicit arguments generate the correct type.
   matrix<> ImpMat4x4;
 
-  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} <line:46:3, col:21>
-  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} <col:3, col:12> col:12 ImpMat4x4 'matrix<>':'matrix<float, 4, 4>'
+  // CHECK: DeclStmt 0x{{[0-9a-fA-F]+}} {{.*}}
+  // CHECK-NEXT: VarDecl 0x{{[0-9a-fA-F]+}} {{.*}} ImpMat4x4 'matrix<>':'matrix<float, 4, 4>'
   return;
 }
diff --git a/clang/test/AST/HLSL/pch_spirv_type.hlsl b/clang/test/AST/HLSL/pch_spirv_type.hlsl
index 8b453810f16b0..359695e001037 100644
--- a/clang/test/AST/HLSL/pch_spirv_type.hlsl
+++ b/clang/test/AST/HLSL/pch_spirv_type.hlsl
@@ -7,13 +7,13 @@
 using namespace hlsl;
 
 // Make sure PCH works by using function declared in PCH header and declare a SpirvType in current file.
-// CHECK:FunctionDecl 0x[[FOO:[0-9a-f]+]] <{{.*}}:2:1, line:4:1> line:2:8 imported used foo 'float2 (float2, float2)'
-// CHECK:VarDecl 0x{{[0-9a-f]+}} <{{.*}}:12:1, col:92> col:92 buffers2 'vk::SpirvOpaqueType<28, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<28, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
+// CHECK:FunctionDecl 0x[[FOO:[0-9a-f]+]] {{.*}} imported used foo 'float2 (float2, float2)'
+// CHECK:VarDecl 0x{{[0-9a-f]+}} {{.*}} buffers2 'vk::SpirvOpaqueType<28, RWBuffer<float>, vk::integral_constant<uint, 4>>':'__hlsl_spirv_type<28, 0, 0, RWBuffer<float>, vk::integral_constant<unsigned int, 4>>'
 vk::SpirvOpaqueType</* OpTypeArray */ 28, RWBuffer<float>, vk::integral_constant<uint, 4>> buffers2;
 
 float2 bar(float2 a, float2 b) {
-// CHECK:CallExpr 0x{{[0-9a-f]+}} <col:10, col:18> 'float2':'vector<float, 2>'
-// CHECK-NEXT:ImplicitCastExpr 0x{{[0-9a-f]+}} <col:10> 'float2 (*)(float2, float2)' <FunctionToPointerDecay>
-// CHECK-NEXT:`-DeclRefExpr 0x{{[0-9a-f]+}} <col:10> 'float2 (float2, float2)' lvalue Function 0x[[FOO]] 'foo' 'float2 (float2, float2)'
+// CHECK:CallExpr 0x{{[0-9a-f]+}} {{.*}} 'float2':'vector<float, 2>'
+// CHECK-NEXT:ImplicitCastExpr 0x{{[0-9a-f]+}} {{.*}} 'float2 (*)(float2, float2)' <FunctionToPointerDecay>
+// CHECK-NEXT:`-DeclRefExpr 0x{{[0-9a-f]+}} {{.*}} 'float2 (float2, float2)' lvalue Function 0x[[FOO]] 'foo' 'float2 (float2, float2)'
   return foo(a, b);
 }
diff --git a/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl b/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
index 9be30a5fb708d..d3fcb2674278c 100644
--- a/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
+++ b/clang/test/SemaHLSL/Semantics/position.ps.struct.hlsl
@@ -4,20 +4,20 @@ using namespace hlsl;
 
 struct S {
   float4 f0 : SV_Position;
-// CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:10 f0 'float4':'vector<float, 4>'
-// CHECK-NEXT:  HLSLParsedSemanticAttr 0x{{[0-9a-f]+}} <col:15> "SV_Position" 0
+// CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} {{.*}} f0 'float4':'vector<float, 4>'
+// CHECK-NEXT:  HLSLParsedSemanticAttr 0x{{[0-9a-f]+}} {{.*}} "SV_Position" 0
 // Use a user semantic to test non-zero index propagation.
   float4 f1 : USER3;
-// CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:10 referenced f1 'float4':'vector<float, 4>'
-// CHECK-NEXT:  HLSLParsedSemanticAttr 0x{{[0-9a-f]+}} <col:15> "USER" 3
+// CHECK: FieldDecl 0x{{[0-9a-fA-F]+}} {{.*}} referenced f1 'float4':'vector<float, 4>'
+// CHECK-NEXT:  HLSLParsedSemanticAttr 0x{{[0-9a-f]+}} {{.*}} "USER" 3
 };
 
 float4 main(S s) : SV_Target {
 // CHECK: FunctionDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> line:[[@LINE-1]]:8 main 'float4 (S)'
-// CHECK-NEXT: ParmVarDecl 0x{{[0-9a-fA-F]+}} <{{.*}}> col:15 used s 'S'
-// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:6:15> "SV_Position" 0
-// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <line:10:15> "USER" 3
+// CHECK-NEXT: ParmVarDecl 0x{{[0-9a-fA-F]+}} {{.*}} used s 'S'
+// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} {{.*}} "SV_Position" 0
+// CHECK-NEXT:  HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} {{.*}} "USER" 3
 
-// CHECK:       HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} <col:20> "SV_Target" 0
+// CHECK:       HLSLAppliedSemanticAttr 0x{{[0-9a-f]+}} {{.*}} "SV_Target" 0
   return s.f1;
 }

>From 0b99d4381235a31c3a3631e554bfa16f4a0aac29 Mon Sep 17 00:00:00 2001
From: Sarah Spall <sarahspall at microsoft.com>
Date: Thu, 12 Nov 2026 11:59:31 -0800
Subject: [PATCH 4/4] add newline to end of file

---
 clang/test/AST/HLSL/implicit-using-namespace.hlsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clang/test/AST/HLSL/implicit-using-namespace.hlsl b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
index 3f8d74bc7ad9b..8a05b201d07d4 100644
--- a/clang/test/AST/HLSL/implicit-using-namespace.hlsl
+++ b/clang/test/AST/HLSL/implicit-using-namespace.hlsl
@@ -16,4 +16,4 @@
 void test(hlsl::vector<float, 2> Value);
 #else
 void test(vector<float, 2> Value);
-#endif
\ No newline at end of file
+#endif



More information about the cfe-commits mailing list