diff --git a/llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp b/llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp
index 8887dc2261a1f..d6e92725f963f 100644
--- a/llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp
+++ b/llvm/lib/SYCLLowerIR/SYCLCreateNVVMAnnotations.cpp
@@ -28,7 +28,6 @@ static void addNVVMMetadata(Function &F, StringRef Name, int Operand) {
                         ConstantAsMetadata::get(
                             ConstantInt::get(Type::getInt32Ty(Ctx), Operand))};
   // Append metadata to nvvm.annotations
-  F.setCallingConv(CallingConv::PTX_Kernel);
   MD->addOperand(MDNode::get(Ctx, MDVals));
 }
 
diff --git a/llvm/test/SYCLLowerIR/nvvm-annotations.ll b/llvm/test/SYCLLowerIR/nvvm-annotations.ll
index c8553ea64b124..84c5d5ce8b488 100644
--- a/llvm/test/SYCLLowerIR/nvvm-annotations.ll
+++ b/llvm/test/SYCLLowerIR/nvvm-annotations.ll
@@ -1,7 +1,7 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --check-globals all --version 5
 ; RUN: opt -passes=sycl-create-nvvm-annotations -S < %s | FileCheck %s
 
-define void @foo_reqd0() !reqd_work_group_size !6 {
+define ptx_kernel void @foo_reqd0() !reqd_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_reqd0(
 ; CHECK-SAME: ) !reqd_work_group_size [[META18:![0-9]+]] {
 ; CHECK-NEXT:    ret void
@@ -9,7 +9,7 @@ define void @foo_reqd0() !reqd_work_group_size !6 {
   ret void
 }
 
-define void @foo_reqd1() !work_group_num_dim !1 !reqd_work_group_size !4 {
+define ptx_kernel void @foo_reqd1() !work_group_num_dim !1 !reqd_work_group_size !4 {
 ; CHECK-LABEL: define ptx_kernel void @foo_reqd1(
 ; CHECK-SAME: ) !reqd_work_group_size [[META19:![0-9]+]] !work_group_num_dim [[META20:![0-9]+]] {
 ; CHECK-NEXT:    ret void
@@ -17,7 +17,7 @@ define void @foo_reqd1() !work_group_num_dim !1 !reqd_work_group_size !4 {
   ret void
 }
 
-define void @foo_reqd2() !work_group_num_dim !2 !reqd_work_group_size !5 {
+define ptx_kernel void @foo_reqd2() !work_group_num_dim !2 !reqd_work_group_size !5 {
 ; CHECK-LABEL: define ptx_kernel void @foo_reqd2(
 ; CHECK-SAME: ) !reqd_work_group_size [[META21:![0-9]+]] !work_group_num_dim [[META22:![0-9]+]] {
 ; CHECK-NEXT:    ret void
@@ -25,7 +25,7 @@ define void @foo_reqd2() !work_group_num_dim !2 !reqd_work_group_size !5 {
   ret void
 }
 
-define void @foo_reqd3() !work_group_num_dim !3 !reqd_work_group_size !6 {
+define ptx_kernel void @foo_reqd3() !work_group_num_dim !3 !reqd_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_reqd3(
 ; CHECK-SAME: ) !reqd_work_group_size [[META18]] !work_group_num_dim [[META23:![0-9]+]] {
 ; CHECK-NEXT:    ret void
@@ -35,7 +35,7 @@ define void @foo_reqd3() !work_group_num_dim !3 !reqd_work_group_size !6 {
 
 ; Check that padding is ignored: we should only read the first dimension of the
 ; 3D metadata
-define void @foo_reqd4() !work_group_num_dim !1 !reqd_work_group_size !6 {
+define ptx_kernel void @foo_reqd4() !work_group_num_dim !1 !reqd_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_reqd4(
 ; CHECK-SAME: ) !reqd_work_group_size [[META18]] !work_group_num_dim [[META20]] {
 ; CHECK-NEXT:    ret void
@@ -43,7 +43,7 @@ define void @foo_reqd4() !work_group_num_dim !1 !reqd_work_group_size !6 {
   ret void
 }
 
-define void @foo_max0() !work_group_num_dim !1 !max_work_group_size !6 {
+define ptx_kernel void @foo_max0() !work_group_num_dim !1 !max_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_max0(
 ; CHECK-SAME: ) !work_group_num_dim [[META20]] !max_work_group_size [[META18]] {
 ; CHECK-NEXT:    ret void
@@ -51,7 +51,7 @@ define void @foo_max0() !work_group_num_dim !1 !max_work_group_size !6 {
   ret void
 }
 
-define void @foo_max1() !work_group_num_dim !2 !max_work_group_size !6 {
+define ptx_kernel void @foo_max1() !work_group_num_dim !2 !max_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_max1(
 ; CHECK-SAME: ) !work_group_num_dim [[META22]] !max_work_group_size [[META18]] {
 ; CHECK-NEXT:    ret void
@@ -59,7 +59,7 @@ define void @foo_max1() !work_group_num_dim !2 !max_work_group_size !6 {
   ret void
 }
 
-define void @foo_max2() !work_group_num_dim !3 !max_work_group_size !6 {
+define ptx_kernel void @foo_max2() !work_group_num_dim !3 !max_work_group_size !6 {
 ; CHECK-LABEL: define ptx_kernel void @foo_max2(
 ; CHECK-SAME: ) !work_group_num_dim [[META23]] !max_work_group_size [[META18]] {
 ; CHECK-NEXT:    ret void
@@ -67,7 +67,7 @@ define void @foo_max2() !work_group_num_dim !3 !max_work_group_size !6 {
   ret void
 }
 
-define void @foo_minwgpercu0() !min_work_groups_per_cu !2 {
+define ptx_kernel void @foo_minwgpercu0() !min_work_groups_per_cu !2 {
 ; CHECK-LABEL: define ptx_kernel void @foo_minwgpercu0(
 ; CHECK-SAME: ) !min_work_groups_per_cu [[META22]] {
 ; CHECK-NEXT:    ret void
@@ -75,7 +75,7 @@ define void @foo_minwgpercu0() !min_work_groups_per_cu !2 {
   ret void
 }
 
-define void @foo_maxwgpermp() !max_work_groups_per_mp !3 {
+define ptx_kernel void @foo_maxwgpermp() !max_work_groups_per_mp !3 {
 ; CHECK-LABEL: define ptx_kernel void @foo_maxwgpermp(
 ; CHECK-SAME: ) !max_work_groups_per_mp [[META23]] {
 ; CHECK-NEXT:    ret void