Squashed 'solver' changes from 5d697c6..ddbc9dc (#703)

ddbc9dc Merge pull request Xilinx#433 from RepoOps/update_makefile_20220908-212141
77270e8 fix calling wrong sqrt function (Xilinx#435)
d203fc4 update doc (Xilinx#434)
2149677 update
c5118f1 update Makefile with 2.0.8 version
8e5495e Merge pull request Xilinx#431 from liyuanz/next
677946c update mk
8dc2d12 init update (Xilinx#430)
f1216f3 update tutorial (Xilinx#429)
cfe8c50 add missing 'description' from api.json (Xilinx#428)
b1500f0 Cr 1129314 (Xilinx#427)
311945c Merge pull request Xilinx#424 from yuanqian/update_next_doc
d7f64d4 Merge pull request Xilinx#426 from liyuanz/add_m
2aaf1e3 add time
fffd33c Merge pull request Xilinx#425 from liyuanz/add_time
dc0b97e add time
fa209b6 update
aef212f Merge pull request Xilinx#423 from yuanqian/next
68288eb change nodsp to fabric
6f426f4 Merge pull request Xilinx#422 from liyuanz/next
bedee68 update
5767296 Merge pull request Xilinx#421 from yuanqian/update_hls_pragama_2
9384d79 fix hls pragma add or sub
ad81e39 update
c02aa5c update
26c22d9 standard docs for portal
837843d Merge pull request Xilinx#417 from yuanqian/update_hls_pragma
b1634b7 Merge pull request Xilinx#419 from liyuanz/next
61b69e7 update mk
d18d892 update hls pragm
a4d48ec Merge pull request Xilinx#416 from changg/22.2_update0
3dd4271 22.2 mk update
2e96054 change 2022.1_stable_latest to 2022.2_stable_latest

Co-authored-by: sdausr <[email protected]>

solver/Jenkinsfile

@@ -2,4 +2,4 @@
 
 VitisLibPipeline (branch: 'next', libname: 'xf_solver', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu:vitis_hw_build',
                   upstream_dependencies: 'xf_utils_hw,next,../utils',
-                  devtest: 'RunDeploy.sh', TOOLVERSION: '2022.1_stable_latest', mail_on:'daily:PR')
+                  devtest: 'RunDeploy.sh', TOOLVERSION: '2022.2_stable_latest', mail_on:'daily:PR')

solver/L1/include/hw/back_substitute.hpp

@@ -134,7 +134,7 @@ struct backSubstituteTraits<RowsColsA,
 // This permits sharing of operators with the factorization function preceding the back-substitution
 template <typename T>
 void back_substitute_recip(T x, T& one_over_x) {
-    // #pragma HLS resource variable=one_over_x core=FDiv
+    // #pragma HLS BIND_OP variable=one_over_x  op=fdiv impl=fabric
     const T ONE = 1.0;
     one_over_x = ONE / x;
 }
@@ -147,7 +147,7 @@ void back_substitute_recip(T x, T& one_over_x) {
 // This permits sharing of operators with the factorization function preceding the back-substitution.
 template <typename T>
 void back_substitute_recip(hls::x_complex<T> x, hls::x_complex<T>& one_over_x) {
-    // #pragma HLS resource variable=recip core=FDiv
+    // #pragma HLS BIND_OP variable=recip  op=fdiv impl=fabric
     T recip; // intermediate variable to allow directive to be applied
     const hls::x_complex<T> ONE = 1.0;
     recip = ONE.real() / x.real();
@@ -157,7 +157,7 @@ void back_substitute_recip(hls::x_complex<T> x, hls::x_complex<T>& one_over_x) {
 
 template <typename T>
 void back_substitute_recip(std::complex<T> x, std::complex<T>& one_over_x) {
-    // #pragma HLS resource variable=recip core=FDiv
+    // #pragma HLS BIND_OP variable=recip  op=fdiv impl=fabric
     T recip; // intermediate variable to allow directive to be applied
     const std::complex<T> ONE(1.0);
     recip = ONE.real() / x.real();

solver/L1/include/hw/pseudosqrt.hpp

@@ -73,7 +73,7 @@ void pseudosqrtStrm(int nrows, hls::stream<ap_uint<TLen * TO> >& matrix, hls::st
     } else {
         static T matA[unrollNm][(rowTemplate + unrollNm - 1) / unrollNm][rowTemplate];
 #pragma HLS array_partition variable = matA cyclic factor = unrollNm
-#pragma HLS resource variable = matA core = XPM_MEMORY uram
+#pragma HLS BIND_STORAGE variable = matA  type=xpm_memory impl=uram
 
         int size0 = nrows;
         int size = (size0 + TO - 1) / TO;