Skip to content

Commit 6a59448

Browse files
author
Pavel V Chupin
committed
[SYCL][PM] Adjust SYCL tests to legacy pass manager removal
Required after: commit 2978d02 Author: Nikita Popov <npopov@redhat.com> Date: Mon Apr 11 12:52:31 2022 +0200 [Clang] Remove support for legacy pass manager This removes the -flegacy-pass-manager and -fno-experimental-new-pass-manager options, and the corresponding support code in BackendUtil. The -fno-legacy-pass-manager and -fexperimental-new-pass-manager options are retained as no-ops. Differential Revision: https://reviews.llvm.org/D123609
1 parent e47f9e7 commit 6a59448

File tree

7 files changed

+1
-53
lines changed

7 files changed

+1
-53
lines changed

clang/test/CodeGenSYCL/group-local-memory-legacy-pm.cpp

Lines changed: 0 additions & 24 deletions
This file was deleted.

clang/test/CodeGenSYCL/kernel-early-optimization-pipeline.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
// Check LLVM optimization pipeline is run by default for SPIR-V compiled for
22
// SYCL device target, and can be disabled with -fno-sycl-early-optimizations.
3-
//
4-
// RUN: %clang_cc1 -O2 -fsycl-is-device -triple spir64-unknown-unknown %s -mllvm -debug-pass=Structure -emit-llvm -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-EARLYOPT
5-
// CHECK-EARLYOPT: Combine redundant instructions
6-
// CHECK-EARLYOPT: Move SYCL printf literal arguments to constant address space
7-
//
8-
// RUN: %clang_cc1 -O2 -fsycl-is-device -triple spir64-unknown-unknown %s -mllvm -debug-pass=Structure -emit-llvm -fno-sycl-early-optimizations -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-NOEARLYOPT
9-
// CHECK-NOEARLYOPT-NOT: Combine redundant instructions
10-
// CHECK-NOEARLYOPT: Move SYCL printf literal arguments to constant address space
11-
//
12-
//
133
// New pass manager doesn't print all passes tree, only module level.
144
//
155
// RUN: %clang_cc1 -O2 -fsycl-is-device -triple spir64-unknown-unknown %s -fno-legacy-pass-manager -mdebug-pass Structure -emit-llvm -o /dev/null 2>&1 | FileCheck %s --check-prefix=CHECK-NEWPM-EARLYOPT

sycl/test/check_device_code/id_queries_fit_int.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// RUN: %clangxx -fsycl-device-only -fsycl-id-queries-fit-in-int -fno-sycl-early-optimizations -S %s -flegacy-pass-manager -o - | FileCheck %s
21
// RUN: %clangxx -fsycl-device-only -fsycl-id-queries-fit-in-int -fno-sycl-early-optimizations -S %s -fno-legacy-pass-manager -o - | FileCheck %s
32

43
#include <CL/sycl.hpp>

sycl/test/esimd/esimd_verify.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
// RUN: not %clangxx -fsycl -fsycl-device-only -flegacy-pass-manager -S %s -o /dev/null 2>&1 | FileCheck %s
21
// RUN: not %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -S %s -o /dev/null 2>&1 | FileCheck %s
3-
// RUN: not %clangxx -fsycl -fsycl-device-only -flegacy-pass-manager -O0 -S %s -o /dev/null 2>&1 | FileCheck %s
42
// RUN: not %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -O0 -S %s -o /dev/null 2>&1 | FileCheck %s
53

64
#include <CL/sycl.hpp>

sycl/test/esimd/lower-external-funcs.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// RUN: %clangxx -fsycl -fsycl-device-only -flegacy-pass-manager -S -emit-llvm -x c++ %s -o %t-lgcy
2-
// RUN: sycl-post-link -split-esimd -lower-esimd -O2 -S %t-lgcy -o %t-lgcy.table
3-
// RUN: FileCheck %s -input-file=%t-lgcy_esimd_0.ll
4-
51
// RUN: %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -S -emit-llvm -x c++ %s -o %t
62
// RUN: sycl-post-link -split-esimd -lower-esimd -O2 -S %t -o %t.table
73
// RUN: FileCheck %s -input-file=%t_esimd_0.ll

sycl/test/esimd/spirv_intrins_trans.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// RUN: %clangxx -fsycl -fsycl-device-only -flegacy-pass-manager -S -emit-llvm -x c++ %s -o %t-lgcy
2-
// RUN: sycl-post-link -split-esimd -lower-esimd -O0 -S %t-lgcy -o %t-lgcy.table
3-
// RUN: FileCheck %s -input-file=%t-lgcy_esimd_0.ll
4-
51
// RUN: %clangxx -fsycl -fsycl-device-only -fno-legacy-pass-manager -S -emit-llvm -x c++ %s -o %t
62
// RUN: sycl-post-link -split-esimd -lower-esimd -O0 -S %t -o %t.table
73
// RUN: FileCheck %s -input-file=%t_esimd_0.ll

sycl/test/esimd/vadd.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,14 @@
1-
// RUN: %clangxx -fsycl -flegacy-pass-manager %s -o %t-lgcy.out
2-
// RUN: %RUN_ON_HOST %t-lgcy.out
3-
41
// RUN: %clangxx -fsycl -fno-legacy-pass-manager %s -o %t.out
52
// RUN: %RUN_ON_HOST %t.out
63

7-
// Check that the code compiles with -O0 and -g on both legacy and new Pass
4+
// Check that the code compiles with -O0 and -g
85
// Managers
96
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -fno-legacy-pass-manager -O0
10-
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -flegacy-pass-manager -O0
117
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -fno-legacy-pass-manager -O0 -g
12-
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -flegacy-pass-manager -O0 -g
138

149
// Check that the code compiles with device code instrumentation enabled
1510
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -fno-legacy-pass-manager \
1611
// RUN: -fsycl-instrument-device-code
17-
// RUN: %clangxx -I %sycl_include %s -o %t.out -fsycl -flegacy-pass-manager \
18-
// RUN: -fsycl-instrument-device-code
1912

2013
#include <CL/sycl.hpp>
2114
#include <iostream>

0 commit comments

Comments
 (0)