diff --git a/llvm/lib/Transforms/Scalar/CMTrans/CMImpParam.cpp b/llvm/lib/Transforms/Scalar/CMTrans/CMImpParam.cpp
index c2776d3f4a57..3c873fcfe11e 100644
--- a/llvm/lib/Transforms/Scalar/CMTrans/CMImpParam.cpp
+++ b/llvm/lib/Transforms/Scalar/CMTrans/CMImpParam.cpp
@@ -211,9 +211,9 @@ struct CMImpParam : public ModulePass {
       case llvm::Intrinsic::genx_get_scoreboard_deltas:
         return KernelMetadata::AK_NORMAL | KernelMetadata::IMP_SB_DELTAS;
       case llvm::Intrinsic::genx_get_scoreboard_bti:
-        return KernelMetadata::AK_NORMAL | KernelMetadata::IMP_SB_BTI;
+        return KernelMetadata::AK_SURFACE | KernelMetadata::IMP_SB_BTI;
       case llvm::Intrinsic::genx_get_scoreboard_depcnt:
-        return KernelMetadata::AK_NORMAL | KernelMetadata::IMP_SB_DEPCNT;
+        return KernelMetadata::AK_SURFACE | KernelMetadata::IMP_SB_DEPCNT;
       case llvm::Intrinsic::genx_local_id_x:
         return KernelMetadata::AK_NORMAL | KernelMetadata::IMP_OCL_LOCAL_ID_X;
       case llvm::Intrinsic::genx_local_id_y: