diff --git a/tools/build_kernels.py b/tools/build_kernels.py index 62f08eb..9528564 100644 --- a/tools/build_kernels.py +++ b/tools/build_kernels.py @@ -2,16 +2,32 @@ """Build the versioned AIR arithmetic and Dayu's authored Metal boundary.""" from pathlib import Path import argparse +import re import subprocess from build_masked_kernel import masked_kernel from float_air_boundary import float_boundary +def metal_tools(): + component = subprocess.check_output( + ['xcodebuild', '-showComponent', 'MetalToolchain'], text=True) + location = re.search(r'^Toolchain Search Path: (.+)$', component, re.MULTILINE) + if not location: + raise RuntimeError('Xcode did not report an installed Metal toolchain') + directory = Path(location.group(1)) / 'Metal.xctoolchain/usr/bin' + commands = {name: str(directory / name) for name in ('metal-opt', 'metal', 'metallib')} + for command in commands.values(): + if not Path(command).is_file(): + raise RuntimeError('Installed Metal tool is missing: ' + command) + return commands + + def main(): parser = argparse.ArgumentParser() parser.add_argument('--output', required=True, type=Path) parser.add_argument('--intermediates', required=True, type=Path) args = parser.parse_args() + tools = metal_tools() root = Path(__file__).resolve().parent.parent work = args.intermediates.resolve() work.mkdir(parents=True, exist_ok=True) @@ -28,17 +44,17 @@ def main(): generated = work / (name + 'Float.ll') generated.write_text(float_boundary(source.read_text(), name)) source = generated - subprocess.run(['xcrun', 'metal-opt', str(source), + subprocess.run([tools['metal-opt'], str(source), '-o', str(target)], check=True) objects.append(str(target)) wrapper = work / 'DYGradeWrapper.air' - subprocess.run(['xcrun', '-sdk', 'macosx', 'metal', '-std=metal3.1', + subprocess.run([tools['metal'], '-std=metal3.1', '-mmacosx-version-min=14.6', '-c', str(root / '大鱼调色/Plugin/DYGrade.metal'), '-o', str(wrapper)], check=True) tracking=work / 'DYTracking.air' - subprocess.run(['xcrun','-sdk','macosx','metal','-std=metal3.1','-mmacosx-version-min=14.6','-c',str(root/'大鱼调色/Plugin/DYTracking.metal'),'-o',str(tracking)],check=True) + subprocess.run([tools['metal'],'-std=metal3.1','-mmacosx-version-min=14.6','-c',str(root/'大鱼调色/Plugin/DYTracking.metal'),'-o',str(tracking)],check=True) objects.append(str(tracking)) - subprocess.run(['xcrun', '-sdk', 'macosx', 'metallib', str(wrapper), *objects, + subprocess.run([tools['metallib'], str(wrapper), *objects, '-o', str(args.output)], check=True) print(args.output) diff --git a/开发交接.md b/开发交接.md index dc715eb..12358a1 100644 --- a/开发交接.md +++ b/开发交接.md @@ -11,7 +11,7 @@ - 前轮修复及诊断已保存检查点,已完成远端核验。本机会话的远端和钥匙串读取成功。 - 新版包含纯色取样随动、独立跟踪参考、手工关键帧、停止原因及最后可信帧定位。24项专项检查原有记录通过,9项新增原生宿主检查及FCP验收待执行。完整构建发现DYTracking.metal重复进入Xcode自动Metal步骤,已改为与DYGrade.metal一致,仅由build_kernels.py生成最终metallib。 - 版本选为1.22.2(134)。正式安装当前仍1.22.1(133),新版本尚在交付准备阶段。 -- Xcode默认Metal发现失败,已安装的Metal 27.2可通过 `TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.922.4,com.apple.dt.toolchain.XcodeDefault` 正常发现。正式构建使用该环境,并保留实际编译验证。 +- Xcode默认Metal发现失败,已安装的Metal 27.2可通过 `TOOLCHAINS=com.apple.dt.toolchain.Metal.32023.922.4,com.apple.dt.toolchain.XcodeDefault` 正常发现。Xcode的构建脚本环境仍选到默认包装器,已修正tools/build_kernels.py,按xcodebuild报告的已安装组件定位全部Metal工具;不依赖外部环境覆盖。 - 既有Xcode工程引用排序差异保持在工作区,未混入提交。 ## 工程和交付入口