From patchwork Wed Oct 12 07:48:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leyi Rong X-Patchwork-Id: 118030 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EF66BA0547; Wed, 12 Oct 2022 09:49:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2EBD42D86; Wed, 12 Oct 2022 09:49:41 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id BE81C42BF0 for ; Wed, 12 Oct 2022 09:49:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1665560980; x=1697096980; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=odufgbcsHKuytB/fh/33k0U6PbAMSvR9Sdc+cT00DE4=; b=k5a0AWVEurOdJEwLQiHXd3Ilh0CwbTDuqQstJ4ezxYhtzuglnwFso2/B 229qaY+xyZ5y+4R7My4knBR0jieiT3KCQRNgKpbt9hUQbXkc4awTmEc8h AGUCD6psIUAO87YkAulL1zeahY1xUyK8ft84UQ6AsNqe8nfUCx7Js2KHP cq49BPObHHYQyLezxby3f3XCWQohhc+Qh6Zw1mvIMF88UoCyb6kNi+64k t/+xafx+ERwBaWnfmkmisTqVpzuk7XYEFpNU875gV2vK0MWbP5cJfnDaN oZV5bjD/XXy0mfyKMlp2w2XmtEevuz4CBlIcUMO/+J3meS/wrO2znMkQ9 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10497"; a="306355649" X-IronPort-AV: E=Sophos;i="5.95,178,1661842800"; d="scan'208";a="306355649" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Oct 2022 00:49:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10497"; a="659841226" X-IronPort-AV: E=Sophos;i="5.95,178,1661842800"; d="scan'208";a="659841226" Received: from dpdk-lrong-icx-01.sh.intel.com ([10.67.119.18]) by orsmga001.jf.intel.com with ESMTP; 12 Oct 2022 00:49:38 -0700 From: Leyi Rong To: yipeng1.wang@intel.com Cc: dev@dpdk.org, Leyi Rong Subject: [PATCH] test/member: fix incorrect expression Date: Wed, 12 Oct 2022 15:48:50 +0800 Message-Id: <20221012074850.3579230-1-leyi.rong@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix incorrect expression by cast division operand to type double to match ceil() and fabs() definitions. Coverity issue: 381398, 381401, 381402 Fixes: db354bd2e1f8 ("member: add NitroSketch mode") Signed-off-by: Leyi Rong --- app/test/test_member.c | 16 ++++++++-------- app/test/test_member_perf.c | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/test/test_member.c b/app/test/test_member.c index 8266e6437b..c1b6a7d8b9 100644 --- a/app/test/test_member.c +++ b/app/test/test_member.c @@ -712,19 +712,19 @@ print_out_sketch_results(uint64_t *count_result, member_set_t *heavy_set, printf("key %2u, count %8"PRIu64", real count %8u, " "heavy_set %u, deviation rate [%.04f]\n", i, count_result[i], - (unsigned int)ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)) * + (unsigned int)ceil((double)SKETCH_LARGEST_KEY_SIZE / (i + 1)) * HH_PKT_SIZE, heavy_set[i], - fabs((float)count_result[i] - (float)NUM_OF_KEY(i) * HH_PKT_SIZE) / - ((float)NUM_OF_KEY(i) * HH_PKT_SIZE)); + fabs((double)count_result[i] - (double)NUM_OF_KEY(i) * HH_PKT_SIZE) / + ((double)NUM_OF_KEY(i) * HH_PKT_SIZE)); else printf("key %2u, count %8"PRIu64", real count %8u, " "heavy_set %u, deviation rate [%.04f]\n", i, count_result[i], - (unsigned int)ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)), + (unsigned int)ceil((double)SKETCH_LARGEST_KEY_SIZE / (i + 1)), heavy_set[i], - fabs((float)count_result[i] - (float)NUM_OF_KEY(i)) / - (float)NUM_OF_KEY(i)); + fabs((double)count_result[i] - (double)NUM_OF_KEY(i)) / + (double)NUM_OF_KEY(i)); } } @@ -879,7 +879,7 @@ test_member_sketch(void) int count_byte = 0; for (i = 0; i < SKETCH_TOTAL_KEY; i++) - total_pkt += ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)); + total_pkt += ceil((double)SKETCH_LARGEST_KEY_SIZE / (i + 1)); printf("\nTotal key count [%u] in Sketch Autotest\n", total_pkt); @@ -892,7 +892,7 @@ test_member_sketch(void) index = 0; for (i = 0; i < SKETCH_TOTAL_KEY; i++) { - for (j = 0; j < ceil(SKETCH_LARGEST_KEY_SIZE / (i + 1)); j++) + for (j = 0; j < ceil((double)SKETCH_LARGEST_KEY_SIZE / (i + 1)); j++) keys[index++] = i; } diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c index b7eb3e4c66..7b6adf913e 100644 --- a/app/test/test_member_perf.c +++ b/app/test/test_member_perf.c @@ -196,7 +196,8 @@ setup_keys_and_data(struct member_perf_params *params, unsigned int cycle, for (i = 0; i < KEYS_TO_ADD; i++) { if (count_down == 0) { distinct_key++; - count_down = ceil(SKETCH_LARGEST_KEY_SIZE / (distinct_key + 1)); + count_down = ceil((double)SKETCH_LARGEST_KEY_SIZE / + (distinct_key + 1)); } memcpy(hh_keys[i], keys[distinct_key], params->key_size); count_down--;