From d1a34523f44b853998bc2740d5b59a472a12eb86 Mon Sep 17 00:00:00 2001
From: Raman Sarokin <sorokin@google.com>
Date: Mon, 15 Jun 2020 11:21:03 -0700
Subject: [PATCH] Added OpenCL versions 2.1/2.2/3.0.

PiperOrigin-RevId: 316505978
Change-Id: I5e35dc8e625aef2feb8f59b10a6a60d175a08314
---
 tensorflow/lite/delegates/gpu/cl/cl_device.cc | 18 +++++++++++++++++-
 tensorflow/lite/delegates/gpu/cl/cl_device.h  | 10 +++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/tensorflow/lite/delegates/gpu/cl/cl_device.cc b/tensorflow/lite/delegates/gpu/cl/cl_device.cc
index 13e299b181b..aea81d5e659 100644
--- a/tensorflow/lite/delegates/gpu/cl/cl_device.cc
+++ b/tensorflow/lite/delegates/gpu/cl/cl_device.cc
@@ -105,8 +105,18 @@ OpenCLVersion ParseCLVersion(const std::string& version) {
     } else {
       return OpenCLVersion::CL_1_0;
     }
+  } else if (major == 2) {
+    if (minor == 2) {
+      return OpenCLVersion::CL_2_2;
+    } else if (minor == 1) {
+      return OpenCLVersion::CL_2_1;
+    } else {
+      return OpenCLVersion::CL_2_0;
+    }
+  } else if (major == 3) {
+    return OpenCLVersion::CL_3_0;
   } else {
-    return OpenCLVersion::CL_2_0;
+    return OpenCLVersion::CL_1_0;
   }
 }
 
@@ -227,6 +237,12 @@ std::string OpenCLVersionToString(OpenCLVersion version) {
       return "1.2";
     case OpenCLVersion::CL_2_0:
       return "2.0";
+    case OpenCLVersion::CL_2_1:
+      return "2.1";
+    case OpenCLVersion::CL_2_2:
+      return "2.2";
+    case OpenCLVersion::CL_3_0:
+      return "3.0";
   }
 }
 
diff --git a/tensorflow/lite/delegates/gpu/cl/cl_device.h b/tensorflow/lite/delegates/gpu/cl/cl_device.h
index 4fd683b78ff..1df16aa3bad 100644
--- a/tensorflow/lite/delegates/gpu/cl/cl_device.h
+++ b/tensorflow/lite/delegates/gpu/cl/cl_device.h
@@ -31,7 +31,15 @@ namespace cl {
 enum class Vendor { QUALCOMM, MALI, POWERVR, NVIDIA, AMD, INTEL, UNKNOWN };
 std::string VendorToString(Vendor v);
 
-enum class OpenCLVersion { CL_1_0, CL_1_1, CL_1_2, CL_2_0 };
+enum class OpenCLVersion {
+  CL_1_0,
+  CL_1_1,
+  CL_1_2,
+  CL_2_0,
+  CL_2_1,
+  CL_2_2,
+  CL_3_0
+};
 std::string OpenCLVersionToString(OpenCLVersion version);
 
 // for use only in cl_device.cc, but putted here to make tests