From a7c72d22b842e5623b6113491a71e9a041497eff Mon Sep 17 00:00:00 2001
From: vladimirlaz <vladimir.lazarev@intel.com>
Date: Wed, 12 May 2021 10:28:37 +0300
Subject: [PATCH] Revert "[SYCL] Align test parameters with 21.16.19610 driver
 (#266)"

This reverts commit 5076b1037dfc81e700caa07d110ab0d09a58a818.
---
 .../noinline_args_size/noinline_args_char_int_size_192.cpp     | 3 ---
 .../noinline_args_size/noinline_args_char_int_size_256.cpp     | 3 ---
 .../noinline_args_size/noinline_args_char_int_size_512.cpp     | 3 ---
 .../noinline_args_size/noinline_args_char_int_size_64.cpp      | 3 ---
 .../noinline_args_size/noinline_args_char_int_size_96.cpp      | 3 ---
 SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp   | 3 ---
 SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp   | 3 ---
 SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp   | 3 ---
 SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp    | 3 ---
 SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp    | 3 ---
 SYCL/ESIMD/private_memory/pm_access_1.cpp                      | 3 +--
 SYCL/ESIMD/private_memory/pm_access_2.cpp                      | 3 +--
 SYCL/ESIMD/private_memory/pm_access_3.cpp                      | 3 +--
 SYCL/USM/badmalloc.cpp                                         | 3 ---
 14 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp
index 0cfd6aed8d..c8f3929841 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_192.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp
index 872b952800..bc560aa1c4 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_256.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp
index 0a011f28ba..19c36cc808 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_512.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp
index 9315a5f326..f6215de0e1 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_64.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp
index 0236102721..3e4ec432cd 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_char_int_size_96.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp
index 5561782b6a..ac3d394361 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_192.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp
index 1388148f8d..ee110be875 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_256.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp
index 6f8edd4a70..b6a774f03a 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_512.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp
index b96ffc7cba..871063260b 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_64.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp
index f294466b6a..a9002a1d7e 100644
--- a/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp
+++ b/SYCL/ESIMD/noinline_args_size/noinline_args_int_size_96.cpp
@@ -10,9 +10,6 @@
 // RUN: %clangxx -fsycl -I%S/.. %s -o %t.out
 // RUN: env IGC_FunctionControl=3 IGC_ForceInlineStackCallWithImplArg=1 %GPU_RUN_PLACEHOLDER %t.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: linux
-
 #include <cstdint>
 
 constexpr unsigned VL = 16;
diff --git a/SYCL/ESIMD/private_memory/pm_access_1.cpp b/SYCL/ESIMD/private_memory/pm_access_1.cpp
index 76a8d878de..caf07d825d 100644
--- a/SYCL/ESIMD/private_memory/pm_access_1.cpp
+++ b/SYCL/ESIMD/private_memory/pm_access_1.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: gpu
-// Sporadic failure in GPU RT 21.16.19610
-// UNSUPPORTED: cuda || (level_zero && linux)
+// UNSUPPORTED: cuda
 // RUN: %clangxx -fsycl -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out 1
diff --git a/SYCL/ESIMD/private_memory/pm_access_2.cpp b/SYCL/ESIMD/private_memory/pm_access_2.cpp
index 421f23a6e0..63c6359f3b 100644
--- a/SYCL/ESIMD/private_memory/pm_access_2.cpp
+++ b/SYCL/ESIMD/private_memory/pm_access_2.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: gpu
-// Sporadic failure in GPU RT 21.16.19610
-// UNSUPPORTED: cuda || (level_zero && linux)
+// UNSUPPORTED: cuda
 // RUN: %clangxx -fsycl -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out 2
diff --git a/SYCL/ESIMD/private_memory/pm_access_3.cpp b/SYCL/ESIMD/private_memory/pm_access_3.cpp
index 0ac26cc3f9..628351bf14 100644
--- a/SYCL/ESIMD/private_memory/pm_access_3.cpp
+++ b/SYCL/ESIMD/private_memory/pm_access_3.cpp
@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 // REQUIRES: gpu
-// Sporadic failure in GPU RT 21.16.19610
-// UNSUPPORTED: cuda || (level_zero && linux)
+// UNSUPPORTED: cuda
 // RUN: %clangxx -fsycl -I%S/.. %S/Inputs/pm_common.cpp -o %t.out
 // RUN: %GPU_RUN_PLACEHOLDER %t.out 3
diff --git a/SYCL/USM/badmalloc.cpp b/SYCL/USM/badmalloc.cpp
index a6d2892dcf..95934477c1 100644
--- a/SYCL/USM/badmalloc.cpp
+++ b/SYCL/USM/badmalloc.cpp
@@ -6,9 +6,6 @@
 // RUN: %GPU_RUN_PLACEHOLDER %t1.out
 // RUN: %ACC_RUN_PLACEHOLDER %t1.out
 
-// Regression in GPU RT 21.16.19610
-// XFAIL: level_zero && gpu
-
 //==----------------- badmalloc.cpp - Bad Mallocs test ---------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.