Skip to content

Commit 594c259

Browse files
jsjijsji
committed
Merge branch 'sycl' into llvmspirv_pulldown
 Conflicts: llvm/lib/SYCLLowerIR/SYCLVirtualFunctionsAnalysis.cpp
2 parents f1a3dc0 + 7d3ac99 commit 594c259

File tree

372 files changed

+6863
-3776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+6863
-3776
lines changed

‎.github/CODEOWNERS

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,18 @@ sycl/doc/design/ @intel/llvm-reviewers-runtime
3434
sycl/doc/design/spirv-extensions/ @intel/dpcpp-spirv-doc-reviewers
3535
sycl/doc/extensions/ @intel/dpcpp-specification-reviewers
3636

37-
# Unified Runtime
38-
sycl/plugins @intel/unified-runtime-reviewers
37+
# Unified Runtime
38+
sycl/cmake/modules/FetchUnifiedRuntime.cmake @intel/unified-runtime-reviewers
39+
sycl/include/sycl/detail/ur.hpp @intel/unified-runtime-reviewers
40+
sycl/source/detail/posix_ur.cpp @intel/unified-runtime-reviewers
41+
sycl/source/detail/ur.cpp @intel/unified-runtime-reviewers
42+
sycl/source/detail/windows_ur.cpp @intel/unified-runtime-reviewers
3943
sycl/test-e2e/Plugin/ @intel/unified-runtime-reviewers
4044

4145
# Win Proxy Loader
4246
sycl/pi_win_proxy_loader @intel/llvm-reviewers-runtime
43-
sycl/plugins/common_win_pi_trace @intel/llvm-reviewers-runtime
4447
sycl/test-e2e/Plugin/dll-detach-order.cpp @intel/llvm-reviewers-runtime
4548

46-
# CUDA and HIP plugins
47-
sycl/plugins/**/cuda/ @intel/llvm-reviewers-cuda
48-
sycl/plugins/**/hip/ @intel/llvm-reviewers-cuda
49-
5049
# CUDA specific runtime implementations
5150
sycl/include/sycl/ext/oneapi/experimental/cuda/ @intel/llvm-reviewers-cuda
5251

@@ -149,7 +148,6 @@ sycl/include/syclcompat.hpp @intel/syclcompat-lib-reviewers
149148
sycl/doc/extensions/experimental/sycl_ext_oneapi_bindless_images.asciidoc @intel/bindless-images-reviewers
150149
sycl/include/sycl/ext/oneapi/bindless* @intel/bindless-images-reviewers
151150
sycl/source/detail/bindless* @intel/bindless-images-reviewers
152-
sycl/plugins/unified_runtime/ur/adapters/**/image.* @intel/bindless-images-reviewers
153151
sycl/test/check_device_code/extensions/bindless_images.cpp @intel/bindless-images-reviewers
154152
sycl/test-e2e/bindless_images/ @intel/bindless-images-reviewers
155153

‎buildbot/check.py

Lines changed: 41 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
DEFAULT_CPU_COUNT = 4
88

9+
910
def do_check(args):
1011
try:
1112
cpu_count = multiprocessing.cpu_count()
@@ -14,52 +15,75 @@ def do_check(args):
1415

1516
# Get absolute path to source directory
1617
if args.src_dir:
17-
abs_src_dir = os.path.abspath(args.src_dir)
18+
abs_src_dir = os.path.abspath(args.src_dir)
1819
else:
19-
abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
20+
abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
2021
# Get absolute path to build directory
2122
if args.obj_dir:
22-
abs_obj_dir = os.path.abspath(args.obj_dir)
23+
abs_obj_dir = os.path.abspath(args.obj_dir)
2324
else:
24-
abs_obj_dir = os.path.join(abs_src_dir, "build")
25+
abs_obj_dir = os.path.join(abs_src_dir, "build")
2526

2627
cmake_cmd = [
2728
"cmake",
28-
"--build", abs_obj_dir,
29+
"--build",
30+
abs_obj_dir,
2931
"--",
3032
args.test_suite,
31-
"-j", str(cpu_count)]
33+
"-j",
34+
str(cpu_count),
35+
]
3236

3337
print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
3438

35-
env_tmp=os.environ
36-
env_tmp["LIT_ARGS"]="\"{}\"".format("-v")
39+
env_tmp = os.environ
40+
env_tmp["LIT_ARGS"] = '"{}"'.format("-v")
3741

3842
subprocess.check_call(cmake_cmd, cwd=abs_obj_dir, env=env_tmp)
3943

4044
ret = True
4145
return ret
4246

47+
4348
def main():
44-
parser = argparse.ArgumentParser(prog="check.py",
45-
description="script to do LIT testing",
46-
formatter_class=argparse.RawTextHelpFormatter)
47-
parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
49+
parser = argparse.ArgumentParser(
50+
prog="check.py",
51+
description="script to do LIT testing",
52+
formatter_class=argparse.RawTextHelpFormatter,
53+
)
54+
parser.add_argument(
55+
"-n", "--build-number", metavar="BUILD_NUM", help="build number"
56+
)
4857
parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
49-
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
50-
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
51-
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
52-
help="builder directory, which is the directory containing source and build directories")
58+
parser.add_argument(
59+
"-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch"
60+
)
61+
parser.add_argument(
62+
"-r", "--pr-number", metavar="PR_NUM", help="pull request number"
63+
)
64+
parser.add_argument(
65+
"-w",
66+
"--builder-dir",
67+
metavar="BUILDER_DIR",
68+
help="builder directory, which is the directory containing source and build directories",
69+
)
5370
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
5471
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
55-
parser.add_argument("-t", "--test-suite", metavar="TEST_SUITE", default="check-all", help="check-xxx target")
72+
parser.add_argument(
73+
"-t",
74+
"--test-suite",
75+
metavar="TEST_SUITE",
76+
default="check-all",
77+
help="check-xxx target",
78+
)
5679

5780
args = parser.parse_args()
5881

5982
print("args:{}".format(args))
6083

6184
return do_check(args)
6285

86+
6387
if __name__ == "__main__":
6488
ret = main()
6589
exit_code = 0 if ret else 1

‎buildbot/clang_tidy.py

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55

66
FILE_EXTENSIONS = [".h", ".hpp", ".c", ".cc", ".cpp"]
77

8+
89
def do_clang_tidy(args):
910
ret = False
1011

11-
merge_base_cmd = ["git", "merge-base", "origin/{}".format(args.base_branch), args.branch]
12+
merge_base_cmd = [
13+
"git",
14+
"merge-base",
15+
"origin/{}".format(args.base_branch),
16+
args.branch,
17+
]
1218
print(merge_base_cmd)
1319
base_commit = subprocess.check_output(merge_base_cmd, cwd=args.src_dir)
1420
base_commit = base_commit.rstrip()
@@ -19,13 +25,15 @@ def do_clang_tidy(args):
1925

2026
diff_cmd = ["git", "--no-pager", "diff", base_commit, args.branch, "--name-only"]
2127
print(diff_cmd)
22-
with open(changed_files, 'w') as f:
23-
subprocess.check_call(merge_base_cmd, cwd=args.src_dir, stdout=f, stderr=subprocess.STDOUT)
28+
with open(changed_files, "w") as f:
29+
subprocess.check_call(
30+
merge_base_cmd, cwd=args.src_dir, stdout=f, stderr=subprocess.STDOUT
31+
)
2432

2533
if os.path.isfile(changed_files):
2634
clang_tidy_binary = os.path.join(args.obj_dir, "bin", "clang-tidy")
2735
if os.path.isfile(clang_tidy_binary):
28-
with open(changed_files, 'r') as f:
36+
with open(changed_files, "r") as f:
2937
for line in f:
3038
filename, file_extension = os.path.splitext(line)
3139
if file_extension.lower() in FILE_EXTENSIONS:
@@ -41,28 +49,51 @@ def do_clang_tidy(args):
4149

4250
return ret
4351

52+
4453
def main():
45-
parser = argparse.ArgumentParser(prog="clang_tidy.py",
46-
description="script to do clang_tidy",
47-
formatter_class=argparse.RawTextHelpFormatter)
48-
parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
49-
parser.add_argument("-b", "--branch", metavar="BRANCH", required=True, help="pull request branch")
50-
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", required=True,
51-
help="pull request base branch")
52-
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
53-
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR", required=True,
54-
help="builder directory, which is the directory containing source and build directories")
55-
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", required=True, help="source directory")
56-
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory")
54+
parser = argparse.ArgumentParser(
55+
prog="clang_tidy.py",
56+
description="script to do clang_tidy",
57+
formatter_class=argparse.RawTextHelpFormatter,
58+
)
59+
parser.add_argument(
60+
"-n", "--build-number", metavar="BUILD_NUM", help="build number"
61+
)
62+
parser.add_argument(
63+
"-b", "--branch", metavar="BRANCH", required=True, help="pull request branch"
64+
)
65+
parser.add_argument(
66+
"-d",
67+
"--base-branch",
68+
metavar="BASE_BRANCH",
69+
required=True,
70+
help="pull request base branch",
71+
)
72+
parser.add_argument(
73+
"-r", "--pr-number", metavar="PR_NUM", help="pull request number"
74+
)
75+
parser.add_argument(
76+
"-w",
77+
"--builder-dir",
78+
metavar="BUILDER_DIR",
79+
required=True,
80+
help="builder directory, which is the directory containing source and build directories",
81+
)
82+
parser.add_argument(
83+
"-s", "--src-dir", metavar="SRC_DIR", required=True, help="source directory"
84+
)
85+
parser.add_argument(
86+
"-o", "--obj-dir", metavar="OBJ_DIR", required=True, help="build directory"
87+
)
5788

5889
args = parser.parse_args()
5990

6091
print("args:{}".format(args))
6192

6293
return do_clang_tidy(args)
6394

95+
6496
if __name__ == "__main__":
6597
ret = main()
6698
exit_code = 0 if ret else 1
6799
sys.exit(exit_code)
68-

‎buildbot/compile.py

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,27 @@ def do_compile(args):
1818

1919
# Get absolute path to source directory
2020
if args.src_dir:
21-
abs_src_dir = os.path.abspath(args.src_dir)
21+
abs_src_dir = os.path.abspath(args.src_dir)
2222
else:
23-
abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
23+
abs_src_dir = os.path.abspath(os.path.join(__file__, "../.."))
2424
# Get absolute path to build directory
2525
if args.obj_dir:
26-
abs_obj_dir = os.path.abspath(args.obj_dir)
26+
abs_obj_dir = os.path.abspath(args.obj_dir)
2727
else:
28-
abs_obj_dir = os.path.join(abs_src_dir, "build")
28+
abs_obj_dir = os.path.join(abs_src_dir, "build")
2929

3030
cmake_cmd = [
3131
"cmake",
32-
"--build", abs_obj_dir,
32+
"--build",
33+
abs_obj_dir,
3334
"--",
3435
args.build_target,
35-
"-j", str(cpu_count)]
36+
"-j",
37+
str(cpu_count),
38+
]
3639

3740
if args.verbose:
38-
cmake_cmd.append("--verbose")
41+
cmake_cmd.append("--verbose")
3942

4043
print("[Cmake Command]: {}".format(" ".join(cmake_cmd)))
4144

@@ -45,20 +48,45 @@ def do_compile(args):
4548

4649

4750
def main():
48-
parser = argparse.ArgumentParser(prog="compile.py",
49-
description="script to do compile",
50-
formatter_class=argparse.RawTextHelpFormatter)
51-
parser.add_argument("-n", "--build-number", metavar="BUILD_NUM", help="build number")
51+
parser = argparse.ArgumentParser(
52+
prog="compile.py",
53+
description="script to do compile",
54+
formatter_class=argparse.RawTextHelpFormatter,
55+
)
56+
parser.add_argument(
57+
"-n", "--build-number", metavar="BUILD_NUM", help="build number"
58+
)
5259
parser.add_argument("-b", "--branch", metavar="BRANCH", help="pull request branch")
53-
parser.add_argument("-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch")
54-
parser.add_argument("-r", "--pr-number", metavar="PR_NUM", help="pull request number")
55-
parser.add_argument("-w", "--builder-dir", metavar="BUILDER_DIR",
56-
help="builder directory, which is the directory containing source and build directories")
60+
parser.add_argument(
61+
"-d", "--base-branch", metavar="BASE_BRANCH", help="pull request base branch"
62+
)
63+
parser.add_argument(
64+
"-r", "--pr-number", metavar="PR_NUM", help="pull request number"
65+
)
66+
parser.add_argument(
67+
"-w",
68+
"--builder-dir",
69+
metavar="BUILDER_DIR",
70+
help="builder directory, which is the directory containing source and build directories",
71+
)
5772
parser.add_argument("-s", "--src-dir", metavar="SRC_DIR", help="source directory")
5873
parser.add_argument("-o", "--obj-dir", metavar="OBJ_DIR", help="build directory")
59-
parser.add_argument("-j", "--build-parallelism", metavar="BUILD_PARALLELISM", help="build parallelism")
60-
parser.add_argument("-v", "--verbose", action='store_true', help="verbose build output")
61-
parser.add_argument("-t", "--build-target", metavar="BUILD_TARGET", default="deploy-sycl-toolchain", help="set build target")
74+
parser.add_argument(
75+
"-j",
76+
"--build-parallelism",
77+
metavar="BUILD_PARALLELISM",
78+
help="build parallelism",
79+
)
80+
parser.add_argument(
81+
"-v", "--verbose", action="store_true", help="verbose build output"
82+
)
83+
parser.add_argument(
84+
"-t",
85+
"--build-target",
86+
metavar="BUILD_TARGET",
87+
default="deploy-sycl-toolchain",
88+
help="set build target",
89+
)
6290

6391
args = parser.parse_args()
6492

0 commit comments

Comments
 (0)