From eec2ef79605d7a631200970bd1a89dee06be06fe Mon Sep 17 00:00:00 2001
From: Matt Arsenault <Matthew.Arsenault@amd.com>
Date: Sat, 3 Jun 2023 10:41:16 -0400
Subject: [PATCH] device-libs: Remove deprecated timer functions

These have been marked deprecated for 9 months. The library also
cannot meaningfully abstract over these, so you might as well use the
raw __builtin_amdgcn_* functions.

Change-Id: Id70e12396933290ff2574a32d7529b76a6309253
---
 amd/device-libs/ockl/inc/ockl.h   |  5 -----
 amd/device-libs/ockl/src/mtime.cl | 14 --------------
 2 files changed, 19 deletions(-)

diff --git a/amd/device-libs/ockl/inc/ockl.h b/amd/device-libs/ockl/inc/ockl.h
index 606b95ad6956fc..b96eaae358bbfd 100644
--- a/amd/device-libs/ockl/inc/ockl.h
+++ b/amd/device-libs/ockl/inc/ockl.h
@@ -143,11 +143,6 @@ DECL_CONST_OCKL_BINARY_U32(mul24)
 DECL_OCKL_NULLARY_U32(lane)
 DECL_OCKL_NULLARY_U32(activelane)
 
-OCKL_DEPRECATED
-DECL_OCKL_NULLARY_U64(memtime)
-
-OCKL_DEPRECATED
-DECL_OCKL_NULLARY_U64(memrealtime)
 DECL_OCKL_NULLARY_U64(cyclectr)
 DECL_OCKL_NULLARY_U64(steadyctr)
 
diff --git a/amd/device-libs/ockl/src/mtime.cl b/amd/device-libs/ockl/src/mtime.cl
index 43f41615e63634..01d4cdebde53b6 100644
--- a/amd/device-libs/ockl/src/mtime.cl
+++ b/amd/device-libs/ockl/src/mtime.cl
@@ -20,20 +20,6 @@ msg_realtime(void)
     return __builtin_amdgcn_s_sendmsg_rtnl(0x83);
 }
 
-// Deprecated
-__attribute__((target("s-memtime-inst"))) ulong
-OCKL_MANGLE_U64(memtime)(void)
-{
-    return __builtin_amdgcn_s_memtime();
-}
-
-// Deprecated
-ulong
-OCKL_MANGLE_U64(memrealtime)(void)
-{
-    return mem_realtime();
-}
-
 ulong
 OCKL_MANGLE_U64(cyclectr)(void)
 {