Skip to content

Commit 2602667

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web' (5 commits)
2 parents 7f76a30 + 08febcf commit 2602667

35 files changed

+366
-152
lines changed

‎buildbot/configure.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def do_configure(args):
5151
llvm_build_shared_libs = 'OFF'
5252
llvm_enable_lld = 'OFF'
5353
sycl_enabled_plugins = ["opencl"]
54+
sycl_preview_lib = 'ON'
5455

5556
sycl_enable_xpti_tracing = 'ON'
5657
xpti_enable_werror = 'OFF'
@@ -141,6 +142,9 @@ def do_configure(args):
141142
if args.enable_plugin:
142143
sycl_enabled_plugins += args.enable_plugin
143144

145+
if args.disable_preview_lib:
146+
sycl_preview_lib = 'OFF'
147+
144148
install_dir = os.path.join(abs_obj_dir, "install")
145149

146150
cmake_cmd = [
@@ -174,6 +178,7 @@ def do_configure(args):
174178
"-DSYCL_CLANG_EXTRA_FLAGS={}".format(sycl_clang_extra_flags),
175179
"-DSYCL_ENABLE_PLUGINS={}".format(';'.join(set(sycl_enabled_plugins))),
176180
"-DSYCL_ENABLE_KERNEL_FUSION={}".format(sycl_enable_fusion),
181+
"-DSYCL_ENABLE_MAJOR_RELEASE_PREVIEW_LIB={}".format(sycl_preview_lib),
177182
"-DBUG_REPORT_URL=https://github.com/intel/llvm/issues",
178183
]
179184

@@ -256,6 +261,7 @@ def main():
256261
parser.add_argument("--llvm-external-projects", help="Add external projects to build. Add as comma seperated list.")
257262
parser.add_argument("--ci-defaults", action="store_true", help="Enable default CI parameters")
258263
parser.add_argument("--enable-plugin", action='append', help="Enable SYCL plugin")
264+
parser.add_argument("--disable-preview-lib", action='store_true', help="Disable building of the SYCL runtime major release preview library")
259265
parser.add_argument("--disable-fusion", action="store_true", help="Disable the kernel fusion JIT compiler")
260266
parser.add_argument("--add_security_flags", type=str, choices=['none', 'default', 'sanitize'], default=None, help="Enables security flags for compile & link. Two values are supported: 'default' and 'sanitize'. 'Sanitize' option is an extension of 'default' set.")
261267
args = parser.parse_args()

‎clang/include/clang/Driver/Options.td

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,6 +1310,14 @@ defm cuda_prec_sqrt : BoolFOption<"cuda-prec-sqrt",
13101310
def emit_static_lib : Flag<["--"], "emit-static-lib">,
13111311
HelpText<"Enable linker job to emit a static library.">;
13121312

1313+
def fpreview_breaking_changes : Flag<["-"], "fpreview-breaking-changes">, Flags<[NoXarchOption]>,
1314+
Visibility<[ClangOption, CLOption]>,
1315+
HelpText<"When specified, it informs the compiler driver and compilation phases "
1316+
"that it is allowed to break backward compatibility. When this option is "
1317+
"specified the compiler will also set the macro __INTEL_PREVIEW_BREAKING_CHANGES.\n"
1318+
"When this option is used in conjunction with -fsycl, the driver will link against "
1319+
"an alternate form of libsycl, libsycl-preview.">;
1320+
13131321
def mprintf_kind_EQ : Joined<["-"], "mprintf-kind=">, Group<m_Group>,
13141322
HelpText<"Specify the printf lowering scheme (AMDGPU only), allowed values are "
13151323
"\"hostcall\"(printing happens during kernel execution, this scheme "

‎clang/lib/Driver/Driver.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,10 @@ DerivedArgList *Driver::TranslateInputArgs(const InputArgList &Args) const {
516516
if (Args.hasFlag(options::OPT_miamcu, options::OPT_mno_iamcu, false))
517517
DAL->AddFlagArg(nullptr, Opts.getOption(options::OPT_static));
518518

519-
// Use of -fintelfpga implies -g
519+
// Use of -fintelfpga implies -g and -fsycl
520520
if (Args.hasArg(options::OPT_fintelfpga)) {
521+
if (!Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false))
522+
DAL->AddFlagArg(0, Opts.getOption(options::OPT_fsycl));
521523
// if any -gN option is provided, use that.
522524
if (Arg *A = Args.getLastArg(options::OPT_gN_Group))
523525
DAL->append(A);
@@ -7091,6 +7093,13 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
70917093

70927094
handleArguments(C, Args, Inputs, Actions);
70937095

7096+
// If '-fintelfpga' is passed, add '-fsycl' to the list of arguments
7097+
const llvm::opt::OptTable &Opts = getOpts();
7098+
Arg *SYCLFpgaArg = C.getInputArgs().getLastArg(options::OPT_fintelfpga);
7099+
if (SYCLFpgaArg &&
7100+
!Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false))
7101+
Args.AddFlagArg(0, Opts.getOption(options::OPT_fsycl));
7102+
70947103
// When compiling for -fsycl, generate the integration header files and the
70957104
// Unique ID that will be used during the compilation.
70967105
if (Args.hasFlag(options::OPT_fsycl, options::OPT_fno_sycl, false)) {

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4802,6 +4802,11 @@ void Clang::ConstructHostCompilerJob(Compilation &C, const JobAction &JA,
48024802
if (IsMSVCHostCompiler)
48034803
HostCompileArgs.push_back("/Zc:__cplusplus");
48044804

4805+
if (TCArgs.hasArg(options::OPT_fpreview_breaking_changes)) {
4806+
HostCompileArgs.push_back(IsMSVCHostCompiler ? "/D" : "-D");
4807+
HostCompileArgs.push_back("__INTEL_PREVIEW_BREAKING_CHANGES");
4808+
}
4809+
48054810
// FIXME: Reuse existing toolchains which are already supported to put
48064811
// together the options.
48074812
// FIXME: For any potential obscure host compilers that do not use the
@@ -5009,10 +5014,19 @@ static void ProcessVSRuntimeLibrary(const ArgList &Args,
50095014
// Add SYCL dependent library
50105015
if (Args.hasArg(options::OPT_fsycl) &&
50115016
!Args.hasArg(options::OPT_nolibsycl)) {
5012-
if (RTOptionID == options::OPT__SLASH_MDd)
5013-
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION "d");
5014-
else
5015-
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION);
5017+
if (RTOptionID == options::OPT__SLASH_MDd) {
5018+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
5019+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION
5020+
"-previewd");
5021+
else
5022+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION "d");
5023+
} else {
5024+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
5025+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION
5026+
"-preview");
5027+
else
5028+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION);
5029+
}
50165030
CmdArgs.push_back("--dependent-lib=sycl-devicelib-host");
50175031
}
50185032
}
@@ -5326,6 +5340,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
53265340
options::OPT_fno_sycl_id_queries_fit_in_int))
53275341
A->render(Args, CmdArgs);
53285342

5343+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
5344+
CmdArgs.push_back("-D__INTEL_PREVIEW_BREAKING_CHANGES");
5345+
53295346
if (SYCLStdArg) {
53305347
// Use of -sycl-std=1.2.1 is deprecated. Emit a diagnostic stating so.
53315348
// TODO: remove support at next approprate major release.
@@ -6493,10 +6510,19 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
64936510
// library.
64946511
if (Args.hasArg(options::OPT_fsycl) && !Args.hasArg(options::OPT_nolibsycl)) {
64956512
if (!D.IsCLMode() && TC.getTriple().isWindowsMSVCEnvironment()) {
6496-
if (isDependentLibAdded(Args, "msvcrtd"))
6497-
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION "d");
6513+
if (isDependentLibAdded(Args, "msvcrtd")) {
6514+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
6515+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION
6516+
"-previewd");
6517+
else
6518+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION "d");
6519+
}
64986520
} else if (!D.IsCLMode() && TC.getTriple().isWindowsGNUEnvironment()) {
6499-
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION ".dll");
6521+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
6522+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION
6523+
"-preview.dll");
6524+
else
6525+
CmdArgs.push_back("--dependent-lib=sycl" SYCL_MAJOR_VERSION ".dll");
65006526
}
65016527
CmdArgs.push_back("--dependent-lib=sycl-devicelib-host");
65026528
}
@@ -10011,7 +10037,8 @@ void SPIRVTranslator::ConstructJob(Compilation &C, const JobAction &JA,
1001110037
",+SPV_INTEL_hw_thread_queries"
1001210038
",+SPV_KHR_uniform_group_instructions"
1001310039
",+SPV_INTEL_masked_gather_scatter"
10014-
",+SPV_INTEL_tensor_float32_conversion";
10040+
",+SPV_INTEL_tensor_float32_conversion"
10041+
",+SPV_INTEL_optnone";
1001510042
if (ShouldPreserveMetadata)
1001610043
ExtArg += ",+SPV_KHR_non_semantic_info";
1001710044

‎clang/lib/Driver/ToolChains/Gnu.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,10 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA,
730730

731731
if (Args.hasArg(options::OPT_fsycl) &&
732732
!Args.hasArg(options::OPT_nolibsycl)) {
733-
CmdArgs.push_back("-lsycl");
733+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
734+
CmdArgs.push_back("-lsycl-preview");
735+
else
736+
CmdArgs.push_back("-lsycl");
734737
CmdArgs.push_back("-lsycl-devicelib-host");
735738
// Use of -fintelfpga implies -lOpenCL.
736739
// FIXME: Adjust to use plugin interface when available.

‎clang/lib/Driver/ToolChains/MSVC.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,12 @@ void visualstudio::Linker::ConstructJob(Compilation &C, const JobAction &JA,
137137
TC.getDriver().Dir + "/../lib"));
138138
// When msvcrtd is added via --dependent-lib, we add the sycld
139139
// equivalent. Do not add the -defaultlib as it conflicts.
140-
if (!isDependentLibAdded(Args, "msvcrtd"))
141-
CmdArgs.push_back("-defaultlib:sycl" SYCL_MAJOR_VERSION ".lib");
140+
if (!isDependentLibAdded(Args, "msvcrtd")) {
141+
if (Args.hasArg(options::OPT_fpreview_breaking_changes))
142+
CmdArgs.push_back("-defaultlib:sycl" SYCL_MAJOR_VERSION "-preview.lib");
143+
else
144+
CmdArgs.push_back("-defaultlib:sycl" SYCL_MAJOR_VERSION ".lib");
145+
}
142146
CmdArgs.push_back("-defaultlib:sycl-devicelib-host.lib");
143147
}
144148

‎clang/test/Driver/sycl-device-optimizations.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// RUN: | FileCheck -check-prefix=CHECK-DEFAULT %s
88
// RUN: %clang_cl -### -fsycl -fsycl-device-only %s 2>&1 \
99
// RUN: | FileCheck -check-prefix=CHECK-DEFAULT %s
10-
// RUN: %clang -### -fsycl -fintelfpga -fsycl-early-optimizations %s 2>&1 \
10+
// RUN: %clang -### -fintelfpga -fsycl-early-optimizations %s 2>&1 \
1111
// RUN: | FileCheck -check-prefix=CHECK-DEFAULT %s
12-
// RUN: %clang_cl -### -fsycl -fintelfpga -fsycl-early-optimizations %s 2>&1 \
12+
// RUN: %clang_cl -### -fintelfpga -fsycl-early-optimizations %s 2>&1 \
1313
// RUN: | FileCheck -check-prefix=CHECK-DEFAULT %s
1414
// CHECK-DEFAULT-NOT: "-fno-sycl-early-optimizations"
1515
// CHECK-DEFAULT-NOT: "-disable-llvm-passes"
@@ -25,9 +25,9 @@
2525
// RUN: | FileCheck -check-prefix=CHECK-NO-SYCL-EARLY-OPTS %s
2626
// RUN: %clang_cl -### -fsycl -fsycl-device-only -fno-sycl-early-optimizations %s 2>&1 \
2727
// RUN: | FileCheck -check-prefix=CHECK-NO-SYCL-EARLY-OPTS %s
28-
// RUN: %clang -### -fsycl -fintelfpga %s 2>&1 \
28+
// RUN: %clang -### -fintelfpga %s 2>&1 \
2929
// RUN: | FileCheck -check-prefix=CHECK-NO-SYCL-EARLY-OPTS %s
30-
// RUN: %clang_cl -### -fsycl -fintelfpga %s 2>&1 \
30+
// RUN: %clang_cl -### -fintelfpga %s 2>&1 \
3131
// RUN: | FileCheck -check-prefix=CHECK-NO-SYCL-EARLY-OPTS %s
3232
// CHECK-NO-SYCL-EARLY-OPTS: "-fno-sycl-early-optimizations"
3333

‎clang/test/Driver/sycl-intelfpga-aoco-win.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
// RUN: echo "void foo() {}" > %t.c
44
// RUN: echo "void foo2() {}" > %t2.c
55
// RUN: %clang -target x86_64-pc-windows-msvc -c -o %t.o %t.c
6-
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fintelfpga -c -o %t2.o %t2.c
6+
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fintelfpga -c -o %t2.o %t2.c
77
// RUN: clang-offload-wrapper -o %t-aoco.bc -host=x86_64-pc-windows-msvc -kind=sycl -target=fpga_aoco-intel-unknown %t.aoco
88
// RUN: llc -filetype=obj -o %t-aoco.o %t-aoco.bc
99
// RUN: llvm-ar crv %t_aoco.a %t.o %t2.o %t-aoco.o
10-
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
10+
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
1111
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO-PHASES-WIN %s
12-
// RUN: %clangxx -target x86_64-pc-windows-msvc -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
12+
// RUN: %clangxx -target x86_64-pc-windows-msvc -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
1313
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO-PHASES-WIN %s
1414
// CHK-FPGA-AOCO-PHASES-WIN: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)
1515
// CHK-FPGA-AOCO-PHASES-WIN: 1: input, "[[INPUTCPP:.+\.cpp]]", c++, (host-sycl)
@@ -42,9 +42,9 @@
4242
// CHK-FPGA-AOCO-PHASES-WIN: 28: offload, "host-sycl (x86_64-pc-windows-msvc)" {11}, "device-sycl (spir64_fpga-unknown-unknown)" {27}, image
4343

4444
/// aoco test, checking tools
45-
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -Xshardware -### %s 2>&1 \
45+
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -Xshardware -### %s 2>&1 \
4646
// RUN: | FileCheck -check-prefix=CHK-FPGA-AOCO %s
47-
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -Xshardware -### %s 2>&1 \
47+
// RUN: %clang_cl --target=x86_64-pc-windows-msvc -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -Xshardware -### %s 2>&1 \
4848
// RUN: | FileCheck -check-prefix=CHK-FPGA-AOCO %s
4949
// CHK-FPGA-AOCO: clang-offload-bundler{{.*}} "-type=aoo" "-excluded-targets=sycl-fpga_aoco-intel-unknown" "-targets=sycl-spir64_fpga-unknown-unknown" "-input=[[INPUTLIB:.+\.a]]" "-output=[[LIBLIST:.+\.txt]]" "-unbundle"
5050
// CHK-FPGA-AOCO: spirv-to-ir-wrapper{{.*}} "[[LIBLIST]]" "-o" "[[LIBLIST2:.+\.txt]]"

‎clang/test/Driver/sycl-intelfpga-aoco.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
// RUN: echo "void foo() {}" > %t.c
66
// RUN: echo "void foo2() {}" > %t2.c
77
// RUN: %clang -c -o %t.o %t.c
8-
// RUN: %clang -fsycl -fintelfpga -c -o %t2.o %t2.c
9-
// RUN: %clang_cl -fsycl -fintelfpga -c -o %t2_cl.o %t2.c
8+
// RUN: %clang -fintelfpga -c -o %t2.o %t2.c
9+
// RUN: %clang_cl -fintelfpga -c -o %t2_cl.o %t2.c
1010
// RUN: clang-offload-wrapper -o %t-aoco.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aoco-intel-unknown %t.aoco
1111
// RUN: llc -filetype=obj -o %t-aoco.o %t-aoco.bc
1212
// RUN: clang-offload-wrapper -o %t-aoco_cl.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aoco-intel-unknown %t.aoco
1313
// RUN: llc -filetype=obj -o %t-aoco_cl.o %t-aoco_cl.bc
1414
// RUN: llvm-ar crv %t_aoco.a %t.o %t2.o %t-aoco.o
1515
// RUN: llvm-ar crv %t_aoco_cl.a %t.o %t2_cl.o %t-aoco_cl.o
16-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
16+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a %s -ccc-print-phases 2>&1 \
1717
// RUN: | FileCheck -check-prefix=CHK-FPGA-AOCO-PHASES %s
1818
// CHK-FPGA-AOCO-PHASES: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)
1919
// CHK-FPGA-AOCO-PHASES: 1: input, "[[INPUTCPP:.+\.cpp]]", c++, (host-sycl)
@@ -46,13 +46,13 @@
4646
// CHK-FPGA-AOCO-PHASES: 28: offload, "host-sycl (x86_64-unknown-linux-gnu)" {11}, "device-sycl (spir64_fpga-unknown-unknown)" {27}, image
4747

4848
/// aoco test, checking tools
49-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware -foffload-static-lib=%t_aoco.a -### %s 2>&1 \
49+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware -foffload-static-lib=%t_aoco.a -### %s 2>&1 \
5050
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO,CHK-FPGA-AOCO-LIN %s
51-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a -### %s 2>&1 \
51+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco.a -### %s 2>&1 \
5252
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO,CHK-FPGA-AOCO-LIN %s
53-
// RUN: %clang_cl -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware -foffload-static-lib=%t_aoco_cl.a -### %s 2>&1 \
53+
// RUN: %clang_cl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware -foffload-static-lib=%t_aoco_cl.a -### %s 2>&1 \
5454
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO,CHK-FPGA-AOCO-WIN %s
55-
// RUN: %clang_cl -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco_cl.a -### %s 2>&1 \
55+
// RUN: %clang_cl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga -Xshardware %t_aoco_cl.a -### %s 2>&1 \
5656
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO,CHK-FPGA-AOCO-WIN %s
5757
// CHK-FPGA-AOCO: clang-offload-bundler{{.*}} "-type=aoo" "-excluded-targets=sycl-fpga_aoco-intel-unknown" "-targets=sycl-spir64_fpga-unknown-unknown" "-input=[[INPUTLIB:.+\.a]]" "-output=[[LIBLIST:.+\.txt]]" "-unbundle"
5858
// CHK-FPGA-AOCO: spirv-to-ir-wrapper{{.*}} "[[LIBLIST]]" "-o" "[[LIBLIST2:.+\.txt]]"
@@ -71,7 +71,7 @@
7171
// CHK-FPGA-AOCO-WIN: link.exe{{.*}} "{{.*}}[[INPUTLIB]]" {{.*}} "[[FINALOBJW]]"
7272

7373
/// aoco archive check with emulation
74-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a %s -ccc-print-phases 2>&1 \
74+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a %s -ccc-print-phases 2>&1 \
7575
// RUN: | FileCheck -check-prefix=CHK-FPGA-AOCO-PHASES-EMU %s
7676
// CHK-FPGA-AOCO-PHASES-EMU: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)
7777
// CHK-FPGA-AOCO-PHASES-EMU: 1: input, "[[INPUTCPP:.+\.cpp]]", c++, (host-sycl)
@@ -102,9 +102,9 @@
102102
// CHK-FPGA-AOCO-PHASES-EMU: 26: offload, "host-sycl (x86_64-unknown-linux-gnu)" {11}, "device-sycl (spir64_fpga-unknown-unknown)" {25}, image
103103

104104
/// aoco emulation test, checking tools
105-
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -### %s 2>&1 \
105+
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco.a -### %s 2>&1 \
106106
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO-EMU,CHK-FPGA-AOCO-EMU-LIN %s
107-
// RUN: %clang_cl -fsycl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco_cl.a -### %s 2>&1 \
107+
// RUN: %clang_cl -fno-sycl-instrument-device-code -fno-sycl-device-lib=all -fintelfpga %t_aoco_cl.a -### %s 2>&1 \
108108
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCO-EMU,CHK-FPGA-AOCO-EMU-WIN %s
109109
// CHK-FPGA-AOCO-EMU: clang-offload-bundler{{.*}} "-type=aoo" "-targets=sycl-spir64_fpga-unknown-unknown" "-input=[[INPUTLIB:.+\.a]]" "-output=[[OUTLIB:.+\.txt]]" "-unbundle"
110110
// CHK-FPGA-AOCO-EMU: llvm-foreach{{.*}} "--out-ext=txt" "--in-file-list=[[OUTLIB]]" "--in-replace=[[OUTLIB]]" "--out-file-list=[[DEVICELIST:.+\.txt]]" "--out-replace=[[DEVICELIST]]" "--" {{.*}}spirv-to-ir-wrapper{{.*}} "[[OUTLIB]]" "-o" "[[DEVICELIST]]"

0 commit comments

Comments
 (0)