Merge pull request #356 from proppy/fix-xls-patches

hls/xls: refresh patches and tests
hdl · Oct 24, 2023 · db7f613 · db7f613
2 parents fc5f16b + 96fca6a
commit db7f613
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 48 deletions.
diff --git a/hls/xls/bump-python-deps.patch b/hls/xls/bump-python-deps.patch
diff --git a/hls/xls/meta.yaml b/hls/xls/meta.yaml
@@ -8,11 +8,8 @@ package:
 source:
   - git_url: https://github.com/google/xls.git
     git_rev: main
-    patches:
-      - use-llvm-toolchain.patch
-      - bump-python-deps.patch
-  - url: https://github.com/bazelbuild/bazelisk/releases/download/v1.12.0/bazelisk-linux-amd64
-    sha256: 6b0bcb2ea15bca16fffabe6fda75803440375354c085480fe361d2cbf32501db
+  - url: https://github.com/bazelbuild/bazelisk/releases/download/v1.18.0/bazelisk-linux-amd64
+    sha256: ce52caa51ef9e509fb6b7e5ad892e5cf10feb0794b0aed4d2f36adb00a1a2779
 
 build:
   # number: 202202082028

diff --git a/hls/xls/test_stdlib.x b/hls/xls/test_stdlib.x
@@ -5,7 +5,7 @@ type F8 = apfloat::APFloat<4, 3>;
 #[test]
 fn cast_test() {
   let fixed1 = s8:1;
-  let float1 = apfloat::cast_from_fixed<u32:4, u32:3>(fixed1);
+  let float1 = apfloat::cast_from_fixed_using_rne<u32:4, u32:3>(fixed1);
   assert_eq(
     apfloat::cast_to_fixed<u32:8, u32:4, u32:3>(float1),
     fixed1

diff --git a/hls/xls/use-llvm-toolchain.patch b/hls/xls/use-llvm-toolchain.patch