Skip to content

Commit c23a03e

Browse files
mdtoguchimdtoguchi
committed
[Driver][SYCL][FPGA] Improve expected triple and link behaviors for AOCX files
When performing -fsycl-link=image behaviors on Windows, there was a mismatch of triples being used when checking for existence of the AOCX binary. This caused a problem when using clang-cl as the triples do not properly match. We also do not want to do any additional unbundling of any AOCX archive, which was causing a conflict of expected FPGA archives. Signed-off-by: Michael D Toguchi <[email protected]>
1 parent ae1b50c commit c23a03e

File tree

3 files changed

+83
-8
lines changed

3 files changed

+83
-8
lines changed

‎clang/lib/Driver/Driver.cpp

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2534,12 +2534,18 @@ static bool runBundler(const SmallVectorImpl<StringRef> &BundlerArgs,
25342534

25352535
bool hasFPGABinary(Compilation &C, std::string Object, types::ID Type) {
25362536
assert(types::isFPGA(Type) && "unexpected Type for FPGA binary check");
2537+
// Do not do the check if the file doesn't exist
2538+
if (!llvm::sys::fs::exists(Object))
2539+
return false;
2540+
25372541
// Temporary names for the output.
25382542
llvm::Triple TT;
25392543
TT.setArchName(types::getTypeName(Type));
25402544
TT.setVendorName("intel");
25412545
TT.setOS(llvm::Triple::UnknownOS);
25422546
TT.setEnvironment(llvm::Triple::SYCLDevice);
2547+
if (C.getDriver().IsCLMode())
2548+
TT.setObjectFormat(llvm::Triple::COFF);
25432549

25442550
// Checking uses -check-section option with the input file, no output
25452551
// file and the target triple being looked for.
@@ -4794,6 +4800,10 @@ void Driver::BuildActions(Compilation &C, DerivedArgList &Args,
47944800
// archive unbundling for Windows.
47954801
if (!isStaticArchiveFile(LA))
47964802
continue;
4803+
// FPGA AOCX files are archives, but we do not want to unbundle them here
4804+
// as they have already been unbundled and processed for linking.
4805+
if (hasFPGABinary(C, LA.str(), types::TY_FPGA_AOCX))
4806+
continue;
47974807
// In MSVC environment offload-static-libs are handled slightly different
47984808
// because of missing support for partial linking in the linker. We add an
47994809
// unbundling action for each static archive which produces list files with

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,12 @@
126126
// RUN: clang-offload-wrapper -o %t-aocx.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aocx-intel-unknown-sycldevice %t.aocx
127127
// RUN: llc -filetype=obj -o %t-aocx.o %t-aocx.bc
128128
// RUN: llvm-ar crv %t_aocx.a %t.o %t-aocx.o
129+
// RUN: clang-offload-wrapper -o %t-aocx_cl.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aocx-intel-unknown-sycldevice-coff %t.aocx
130+
// RUN: llc -filetype=obj -o %t-aocx_cl.o %t-aocx_cl.bc
131+
// RUN: llvm-ar crv %t_aocx_cl.a %t.o %t-aocx_cl.o
129132
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t_aocx.a -ccc-print-phases 2>&1 \
130133
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-PHASES %s
131-
// RUN: %clang_cl -fsycl -fintelfpga %t_aocx.a -ccc-print-phases 2>&1 \
134+
// RUN: %clang_cl -fsycl -fintelfpga %t_aocx_cl.a -ccc-print-phases 2>&1 \
132135
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-PHASES %s
133136
// CHK-FPGA-AOCX-PHASES: 0: input, "{{.*}}", fpga_aocx, (host-sycl)
134137
// CHK-FPGA-AOCX-PHASES: 1: linker, {0}, image, (host-sycl)
@@ -138,9 +141,9 @@
138141

139142
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t_aocx.a -### 2>&1 \
140143
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX,CHK-FPGA-AOCX-LIN %s
141-
// RUN: %clang_cl -fsycl -fintelfpga %t_aocx.a -### 2>&1 \
144+
// RUN: %clang_cl -fsycl -fintelfpga %t_aocx_cl.a -### 2>&1 \
142145
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX,CHK-FPGA-AOCX-WIN %s
143-
// CHK-FPGA-AOCX: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
146+
// CHK-FPGA-AOCX: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice{{(-coff)?}}" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
144147
// CHK-FPGA-AOCX: clang-offload-wrapper{{.*}} "-o=[[WRAPOUT:.+\.bc]]" {{.*}} "-target=spir64_fpga" "-kind=sycl" "[[BUNDLEOUT]]"
145148
// CHK-FPGA-AOCX-LIN: llc{{.*}} "-filetype=obj" "-o" "[[LLCOUT:.+\.o]]" "[[WRAPOUT]]"
146149
// CHK-FPGA-AOCX-WIN: llc{{.*}} "-filetype=obj" "-o" "[[LLCOUT2:.+\.obj]]" "[[WRAPOUT]]"
@@ -150,9 +153,9 @@
150153
/// AOCX with source
151154
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %s %t_aocx.a -### 2>&1 \
152155
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-SRC,CHK-FPGA-AOCX-SRC-LIN %s
153-
// RUN: %clang_cl -fsycl -fintelfpga %s %t_aocx.a -### 2>&1 \
156+
// RUN: %clang_cl -fsycl -fintelfpga %s %t_aocx_cl.a -### 2>&1 \
154157
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-SRC,CHK-FPGA-AOCX-SRC-WIN %s
155-
// CHK-FPGA-AOCX-SRC: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
158+
// CHK-FPGA-AOCX-SRC: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice{{(-coff)?}}" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
156159
// CHK-FPGA-AOCX-SRC: clang-offload-wrapper{{.*}} "-o=[[WRAPOUT:.+\.bc]]" {{.*}} "-target=spir64_fpga" "-kind=sycl" "[[BUNDLEOUT]]"
157160
// CHK-FPGA-AOCX-SRC: llc{{.*}} "-filetype=obj" "-o" "[[LLCOUT:.+\.(o|obj)]]" "[[WRAPOUT]]"
158161
// CHK-FPGA-AOCX-SRC: clang{{.*}} "-cc1" {{.*}} "-fsycl-is-device" {{.*}} "-o" "[[DEVICEBC:.+\.bc]]"
@@ -168,9 +171,9 @@
168171
// RUN: touch %t.o
169172
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga %t.o %t_aocx.a -### 2>&1 \
170173
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-OBJ,CHK-FPGA-AOCX-OBJ-LIN %s
171-
// RUN: %clang_cl -fsycl -fintelfpga %t.o %t_aocx.a -### 2>&1 \
174+
// RUN: %clang_cl -fsycl -fintelfpga %t.o %t_aocx_cl.a -### 2>&1 \
172175
// RUN: | FileCheck -check-prefixes=CHK-FPGA-AOCX-OBJ,CHK-FPGA-AOCX-OBJ-WIN %s
173-
// CHK-FPGA-AOCX-OBJ: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
176+
// CHK-FPGA-AOCX-OBJ: clang-offload-bundler{{.*}} "-type=ao" "-targets=sycl-fpga_aocx-intel-unknown-sycldevice{{(-coff)?}}" "-inputs=[[LIBINPUT:.+\.a]]" "-outputs=[[BUNDLEOUT:.+\.aocx]]" "-unbundle"
174177
// CHK-FPGA-AOCX-OBJ: clang-offload-wrapper{{.*}} "-o=[[WRAPOUT:.+\.bc]]" {{.*}} "-target=spir64_fpga" "-kind=sycl" "[[BUNDLEOUT]]"
175178
// CHK-FPGA-AOCX-OBJ: llc{{.*}} "-filetype=obj" "-o" "[[LLCOUT:.+\.(o|obj)]]" "[[WRAPOUT]]"
176179
// CHK-FPGA-AOCX-OBJ: clang-offload-bundler{{.*}} "-type=o" {{.*}} "-outputs=[[HOSTOBJ:.+\.(o|obj)]],[[DEVICEOBJ:.+\.(o|obj)]]" "-unbundle"
@@ -332,8 +335,10 @@
332335
// RUN: %clang_cl -fsycl -c -o %t2_cl.o %t2.c
333336
// RUN: clang-offload-wrapper -o %t-aoco.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aoco-intel-unknown-sycldevice %t.aoco
334337
// RUN: llc -filetype=obj -o %t-aoco.o %t-aoco.bc
338+
// RUN: clang-offload-wrapper -o %t-aoco_cl.bc -host=x86_64-unknown-linux-gnu -kind=sycl -target=fpga_aoco-intel-unknown-sycldevice-coff %t.aoco
339+
// RUN: llc -filetype=obj -o %t-aoco_cl.o %t-aoco_cl.bc
335340
// RUN: llvm-ar crv %t_aoco.a %t.o %t2.o %t-aoco.o
336-
// RUN: llvm-ar crv %t_aoco_cl.a %t.o %t2_cl.o %t-aoco.o
341+
// RUN: llvm-ar crv %t_aoco_cl.a %t.o %t2_cl.o %t-aoco_cl.o
337342
// RUN: %clangxx -target x86_64-unknown-linux-gnu -fsycl -fintelfpga -foffload-static-lib=%t_aoco.a %s -### -ccc-print-phases 2>&1 \
338343
// RUN: | FileCheck -check-prefix=CHK-FPGA-AOCO-PHASES %s
339344
// CHK-FPGA-AOCO-PHASES: 0: input, "[[INPUTA:.+\.a]]", object, (host-sycl)

‎sycl/test/fpga_tests/fpga_aocx_win.cpp

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
//==--- fpga_aocx_win.cpp - AOT compilation for fpga using aoc with aocx ---==//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
9+
// REQUIRES: aoc, accelerator
10+
// REQUIRES: system-windows
11+
12+
/// E2E test for AOCX creation/use/run for FPGA
13+
// Produce an archive with device (AOCX) image
14+
// RUN: %clang_cl -fsycl -fintelfpga -fsycl-link=image -DDEVICE_PART %s -o %t_image_cl.a
15+
// Produce a host object
16+
// RUN: %clang_cl -fsycl -fintelfpga -DHOST_PART %s -c -o %t.o
17+
18+
// AOCX with source
19+
// RUN: %clang_cl -fsycl -fintelfpga -DHOST_PART %s %t_image_cl.a -o %t_aocx_src.out
20+
// AOCX with object
21+
// RUN: %clang_cl -fsycl -fintelfpga %t.o %t_image_cl.a -o %t_aocx_obj.out
22+
//
23+
// RUN: env SYCL_DEVICE_TYPE=ACC %t_aocx_src.out
24+
// RUN: env SYCL_DEVICE_TYPE=ACC %t_aocx_obj.out
25+
26+
#include "CL/sycl.hpp"
27+
#include <iostream>
28+
29+
using namespace cl::sycl;
30+
31+
#ifdef DEVICE_PART
32+
33+
const double big[] = {3, 2, 1, 5, 6, 7};
34+
void foo(double &result, queue q, int x) {
35+
buffer<double> buf(&result, 1);
36+
buffer<double, 1> big_buf(big, sizeof(big) / sizeof(double));
37+
q.submit([&](handler &cgh) {
38+
auto acc = buf.get_access<access::mode::discard_write>(cgh);
39+
auto big_acc = big_buf.get_access<access::mode::read>(cgh);
40+
cgh.single_task<class test>([=]() {
41+
acc[0] = big_acc[x];
42+
});
43+
});
44+
}
45+
46+
#endif // DEVICE_PART
47+
48+
#ifdef HOST_PART
49+
50+
void foo(double &, queue q, int x);
51+
52+
int main(void) {
53+
queue q(accelerator_selector{});
54+
55+
double result;
56+
foo(result, q, 3);
57+
std::cout << "Result: " << result << "\n";
58+
}
59+
60+
#endif // HOST_PART

0 commit comments

Comments
 (0)