rolling_hash: deprecate old API

Use new API in perf app

Signed-off-by: Marcel Cornu <[email protected]>

Author: mdcornu

include/rolling_hashx.h

@@ -42,6 +42,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
+#include "types.h"
 
 /*
  * Define enums from API v2.24, so applications that were using this version
@@ -85,7 +86,9 @@ struct rh_state2 {
  * @param state Structure holding state info on current rolling hash
  * @param w     Window width (1 <= w <= 32)
  * @returns 0 - success, -1 - failure
+ * @deprecated Please use isal_rolling_hash2_init() instead.
  */
+ISAL_DEPRECATED("Please use isal_rolling_hash2_init() instead")
 int
 rolling_hash2_init(struct rh_state2 *state, uint32_t w);
 
@@ -95,7 +98,9 @@ rolling_hash2_init(struct rh_state2 *state, uint32_t w);
  * @param state Structure holding state info on current rolling hash
  * @param init_bytes Optional window size buffer to pre-init hash
  * @returns none
+ * @deprecated Please use isal_rolling_hash2_reset() instead.
  */
+ISAL_DEPRECATED("Please use isal_rolling_hash2_reset() instead")
 void
 rolling_hash2_reset(struct rh_state2 *state, uint8_t *init_bytes);
 
@@ -110,7 +115,9 @@ rolling_hash2_reset(struct rh_state2 *state, uint8_t *init_bytes);
  * @param trigger Match value to compare with windowed hash at each input byte
  * @param offset  Offset from buffer to match, set if match found
  * @returns ISAL_FINGERPRINT_RET_HIT - match found, ISAL_FINGERPRINT_RET_MAX - exceeded max length
+ * @deprecated Please use isal_rolling_hash2_run() instead.
  */
+ISAL_DEPRECATED("Please use isal_rolling_hash2_run() instead")
 int
 rolling_hash2_run(struct rh_state2 *state, uint8_t *buffer, uint32_t max_len, uint32_t mask,
                   uint32_t trigger, uint32_t *offset);
@@ -121,7 +128,9 @@ rolling_hash2_run(struct rh_state2 *state, uint8_t *buffer, uint32_t max_len, ui
  * @param mean  Target chunk size in bytes
  * @param shift Bits to rotate result to get independent masks
  * @returns 32-bit mask value
+ * @deprecated Please use isal_rolling_hashx_mask_gen() instead.
  */
+ISAL_DEPRECATED("Please use isal_rolling_hashx_mask_gen() instead")
 uint32_t
 rolling_hashx_mask_gen(long mean, int shift);
 

rolling_hash/rolling_hash2_perf.c

@@ -51,13 +51,13 @@
 #endif
 
 #ifndef FUT_run
-#define FUT_run rolling_hash2_run
+#define FUT_run isal_rolling_hash2_run
 #endif
 #ifndef FUT_init
-#define FUT_init rolling_hash2_init
+#define FUT_init isal_rolling_hash2_init
 #endif
 #ifndef FUT_reset
-#define FUT_reset rolling_hash2_reset
+#define FUT_reset isal_rolling_hash2_reset
 #endif
 
 #define str(s)  #s
@@ -72,9 +72,10 @@
 int
 main(int argc, char *argv[])
 {
+#ifndef FIPS_MODE
         uint8_t *buf;
         uint32_t mask, trigger, offset = 0;
-        int i, w, ret;
+        int i, w, ret, match;
         long long run_length;
         struct rh_state2 *state;
         struct perf start, stop;
@@ -105,20 +106,42 @@ main(int argc, char *argv[])
         printf("Start timed tests\n");
         fflush(0);
 
-        FUT_init(state, w);
-        FUT_reset(state, buf);
-        ret = FUT_run(state, buf, TEST_LEN, mask, trigger, &offset);
+        ret = FUT_init(state, w);
+        if (ret) {
+                printf(xstr(FUT_init) " error (%d)\n", ret);
+                return -1;
+        }
+        ret = FUT_reset(state, buf);
+        if (ret) {
+                printf(xstr(FUT_reset) " error (%d)\n", ret);
+                return -1;
+        }
+        ret = FUT_run(state, buf, TEST_LEN, mask, trigger, &offset, &match);
+        if (ret)
+                goto run_error;
 
         perf_start(&start);
         for (i = 0; i < TEST_LOOPS; i++) {
-                ret = FUT_run(state, buf, TEST_LEN, mask, trigger, &offset);
+                ret = FUT_run(state, buf, TEST_LEN, mask, trigger, &offset, &match);
         }
         perf_stop(&stop);
 
-        run_length = (ret == ISAL_FINGERPRINT_RET_HIT) ? offset : TEST_LEN;
+        if (ret)
+                goto run_error;
+
+        run_length = (match == ISAL_FINGERPRINT_RET_HIT) ? offset : TEST_LEN;
         printf("  returned %d after %lld B\n", ret, run_length);
         printf(xstr(FUT_run) TEST_TYPE_STR ": ");
         perf_print(stop, start, run_length * i);
 
         return 0;
+
+run_error:
+        printf(xstr(FUT_run) " error (%d)\n", ret);
+        return -1;
+#else
+        printf("FIPS Mode enabled. Perf test not run.\n");
+
+        return 0;
+#endif /* FIPS_MODE */
 }