Skip to content

Commit 6ac800b

Browse files
[SYCL] small e2e test fixes (#14787)
This PR makes minor fixes to a few tests. Improves sycl_device_flags.cpp so that it not dependent on the stable but inscrutable hash `OCL_asmaf99e2d4667ef6d3` appearing in any file names. Removes some stray comment markers.
1 parent cd8d6d8 commit 6ac800b

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

sycl/test-e2e/DeviceLib/imf_fp32_rounding_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// RUN: %{run} %t.out
66
//
77
// UNSUPPORTED: cuda || hip
8-
// end INTEL_CUSTOMIZATION
98

109
#include "imf_utils.hpp"
1110
#include <sycl/ext/intel/math.hpp>

sycl/test-e2e/DeviceLib/imf_fp64_rounding_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
// RUN: %{run} %t.out
77
//
88
// UNSUPPORTED: cuda || hip
9-
// end INTEL_CUSTOMIZATION
109

1110
#include "imf_utils.hpp"
1211
#include <sycl/ext/intel/math.hpp>

sycl/test-e2e/KernelCompiler/sycl_device_flags.cpp

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,29 @@ void test_1(sycl::queue &Queue, sycl::kernel &Kernel, int seed) {
7474
int test_dump(std::string &dump_dir) {
7575
// If this has been run with the shader dump environment variables set, then
7676
// the output files we are looking for should be in ./dump
77-
78-
std::string command_one = "grep -q -e '-doubleGRF' " + dump_dir +
79-
"/OCL_asmaf99e2d4667ef6d3_options.txt";
80-
std::string command_two = "grep -q -e '-Xfinalizer \"-printregusage\"' " +
81-
dump_dir + "/OCL_asmaf99e2d4667ef6d3_options.txt";
77+
// There are two files whose name ends in _options. We do NOT want
78+
// the file that ends in _internal_options.txt
79+
80+
std::string command_one =
81+
"find " + dump_dir +
82+
" -name \"*_options.txt\" -not -name \"*_internal_options.txt\" -type f "
83+
"-exec grep -q -e "
84+
"'-doubleGRF' {} +";
85+
std::string command_two =
86+
"find " + dump_dir +
87+
" -name \"*_options.txt\" -not -name \"*_internal_options.txt\" -type f "
88+
"-exec grep -q -e "
89+
"'-Xfinalizer \"-printregusage\"' {} +";
90+
91+
// 0 means success, any other value is a failure
8292
int result_one = std::system(command_one.c_str());
8393
int result_two = std::system(command_two.c_str());
8494

8595
if (result_one == 0 && result_two == 0) {
8696
return 0;
8797
} else {
98+
std::cout << "result_one: " << result_one << " result_two: " << result_two
99+
<< std::endl;
88100
return -1;
89101
}
90102
}

0 commit comments

Comments
 (0)