开源软件构建与测试

Changes of Revision 10

_service:tar_scm:0001-Fix-build-on-riscv64.patch Changed

@@ -55,26 +55,26 @@
    // For code object version 2 and 3, the offload kind in bundle ID is 'hip'
    // for backward compatibility. For code object version 4 and greater, the
 diff --git a/external/llvm-project/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/external/llvm-project/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
-index 1de1a30a7..718bc1d46 100644
+index dda7a7d74..dfbf86e25 100644
 --- a/external/llvm-project/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
 +++ b/external/llvm-project/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp
-@@ -404,15 +404,23 @@ fatbinary(ArrayRef<std::pair<StringRef, StringRef>> InputFiles,
+@@ -461,7 +461,12 @@ fatbinary(ArrayRef<std::pair<StringRef, StringRef>> InputFiles,
    SmallVector<StringRef, 16> CmdArgs;
    CmdArgs.push_back(*OffloadBundlerPath);
    CmdArgs.push_back("-type=o");
 +#if defined(__x86_64)
    CmdArgs.push_back("-bundle-align=4096");
--
 +#elif (defined(__riscv) && __riscv_xlen == 64)
-+  CmdArgs.push_back("-bundle-align=4096");
++  CmdArgs.push_back("-bundle-align=65536");
 +#else
 +#endif
+ 
    if (Args.hasArg(OPT_compress))
      CmdArgs.push_back("-compress");
-   if (auto *Arg = Args.getLastArg(OPT_compression_level_eq))
+@@ -469,7 +474,12 @@ fatbinary(ArrayRef<std::pair<StringRef, StringRef>> InputFiles,
      CmdArgs.push_back(
          Args.MakeArgString(Twine("-compression-level=") + Arg->getValue()));
--
+ 
 +#if defined(__x86_64)
    SmallVector<StringRef> Targets = {"-targets=host-x86_64-unknown-linux"};
 +#elif (defined(__riscv) && __riscv_xlen == 64)
@@ -82,7 +82,7 @@
 +#else
 +#endif
    for (const auto &File, Arch : InputFiles)
-     Targets.push_back(Saver.save("hipv4-amdgcn-amd-amdhsa--" + Arch));
+     Targets.push_back(Saver.save("hip-amdgcn-amd-amdhsa--" + Arch));
    CmdArgs.push_back(Saver.save(llvm::join(Targets, ",")));
 diff --git a/mlir/tools/xmir-runner/CMakeLists.txt b/mlir/tools/xmir-runner/CMakeLists.txt
 index 81f484a51..bc88a0a7f 100644