Merge "springbok: make crt0.s portable"
diff --git a/softrvv/include/softrvv_vadd.h b/softrvv/include/softrvv_vadd.h
index 96271a7..ae712c6 100644
--- a/softrvv/include/softrvv_vadd.h
+++ b/softrvv/include/softrvv_vadd.h
@@ -8,25 +8,25 @@
template <typename T>
void vadd_vi(T *dest, T *src1, T src2, size_t avl) {
- for (int idx = 0; idx < avl; idx++) {
+ for (size_t idx = 0; idx < avl; idx++) {
dest[idx] = src1[idx] + src2;
}
}
template <typename T>
void vadd_vx(T *dest, T *src1, const T *src2, size_t avl) {
- for (int idx = 0; idx < avl; idx++) {
+ for (size_t idx = 0; idx < avl; idx++) {
dest[idx] = src1[idx] + *src2;
}
}
template <typename T>
void vadd_vv(T *dest, T *src1, T *src2, size_t avl) {
- for (int idx = 0; idx < avl; idx++) {
+ for (size_t idx = 0; idx < avl; idx++) {
dest[idx] = src1[idx] + src2[idx];
}
}
} // namespace softrvv
-#endif // SOFTRVV_VADD_H
\ No newline at end of file
+#endif // SOFTRVV_VADD_H
diff --git a/tests/vadd_vv_test.cpp b/tests/vadd_vv_test.cpp
index 71f1f8e..cd9be4d 100644
--- a/tests/vadd_vv_test.cpp
+++ b/tests/vadd_vv_test.cpp
@@ -41,7 +41,7 @@
int8_t *ptr_ref_vec_1 = reinterpret_cast<int8_t *>(reference_vector_1);
// set up values to test up to index of the AVL
- for (int idx = 0; idx < avl; idx++) {
+ for (int idx = 0; idx < vl; idx++) {
// restrict values to valid int8_t range
ptr_vec_1[idx] = idx % (INT8_MAX) + (INT8_MIN);
reference_vector_1[idx] = ptr_vec_1[idx];
@@ -70,7 +70,7 @@
int##_SEW_##_t *ptr_ref_vec_1 = \
reinterpret_cast<int##_SEW_##_t *>(reference_vector_1); \
\
- for (long long idx = 0; idx < avl; idx++) { \
+ for (long long idx = 0; idx < vl; idx++) { \
ptr_vec_1[idx] = idx % INT##_SEW_##_MAX + INT##_SEW_##_MIN; \
ptr_ref_vec_1[idx] = ptr_vec_1[idx]; \
} \
diff --git a/tests/vmax_vv_test.cpp b/tests/vmax_vv_test.cpp
index 24daa7c..f4183ec 100644
--- a/tests/vmax_vv_test.cpp
+++ b/tests/vmax_vv_test.cpp
@@ -61,7 +61,7 @@
const int16_t start_value = INT16_MAX;
// set up values for vs2 of vmax.vv
- for (int idx = 0; idx < avl; idx++) {
+ for (int idx = 0; idx < vl; idx++) {
// restrict values to valid int8_t range
ptr_vec_1[idx] = (int16_t)(idx + start_value);
}
@@ -69,7 +69,7 @@
__asm__ volatile("vle16.v v8, (%0)" : : "r"(ptr_vec_1));
// set up values for vs2 of vmax.vv
- for (int idx = 0; idx < avl; idx++) {
+ for (int idx = 0; idx < vl; idx++) {
// offset sequence for ptr_vec_2
ptr_vec_2[idx] = (int16_t)(idx - start_value);
}
@@ -105,10 +105,10 @@
int##_SEW_##_t *ptr_vec_2 = \
reinterpret_cast<int##_SEW_##_t *>(test_vector_2); \
const int##_SEW_##_t start_value = START_VALUE; \
- for (int idx = 0; idx < avl; idx++) { \
+ for (int idx = 0; idx < vl; idx++) { \
ptr_vec_1[idx] = (int##_SEW_##_t)(idx + start_value); \
} \
- for (int idx = 0; idx < avl; idx++) { \
+ for (int idx = 0; idx < vl; idx++) { \
ptr_vec_1[idx] = (int##_SEW_##_t)(idx - start_value); \
} \
__asm__ volatile("vle" #_SEW_ ".v v8, (%0)" : : "r"(ptr_vec_1)); \
@@ -141,4 +141,3 @@
} // namespace
} // namespace vmax_vv_test
-
diff --git a/tests/vmax_vx_test.cpp b/tests/vmax_vx_test.cpp
index 67d8c2a..a20c2e8 100644
--- a/tests/vmax_vx_test.cpp
+++ b/tests/vmax_vx_test.cpp
@@ -40,7 +40,7 @@
int8_t *ptr_vec_2 = reinterpret_cast<int8_t *>(test_vector_2);
const int8_t test_val = 8;
- for (int idx = 0; idx < avl; idx++) {
+ for (int idx = 0; idx < vl; idx++) {
ptr_vec_1[idx] = idx;
}
__asm__ volatile("vle8.v v8, (%0)" : : "r"(ptr_vec_1));
@@ -71,7 +71,7 @@
int##_SEW_##_t *ptr_vec_2 = \
reinterpret_cast<int##_SEW_##_t *>(test_vector_2); \
const int##_SEW_##_t test_val = TEST_VAL; \
- for (int idx = 0; idx < avl; idx++) { \
+ for (int idx = 0; idx < vl; idx++) { \
ptr_vec_1[idx] = idx; \
} \
__asm__ volatile("vle" #_SEW_ ".v v8, (%0)" : : "r"(ptr_vec_1)); \
@@ -103,4 +103,3 @@
} // namespace
} // namespace vmax_vx_test
-
