From ea28adf170ac8dd8d6d53f1563214f78d5032e8e Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Wed, 7 Feb 2024 10:20:46 +0000 Subject: [PATCH 1/4] Enable powif* intrinsics These are supported by CBMC with https://github.com/diffblue/cbmc/pull/8192 merged. Resolves: #2763 --- docs/src/rust-feature-support/intrinsics.md | 4 ++-- .../codegen_cprover_gotoc/codegen/intrinsic.rs | 4 ++-- tests/kani/Intrinsics/Math/Arith/powi.rs | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 tests/kani/Intrinsics/Math/Arith/powi.rs diff --git a/docs/src/rust-feature-support/intrinsics.md b/docs/src/rust-feature-support/intrinsics.md index 0705d3b00f1b..a424e777a30c 100644 --- a/docs/src/rust-feature-support/intrinsics.md +++ b/docs/src/rust-feature-support/intrinsics.md @@ -187,8 +187,8 @@ nontemporal_store | No | | offset | Partial | Doesn't check [all UB conditions](https://doc.rust-lang.org/std/primitive.pointer.html#safety-2) | powf32 | No | | powf64 | No | | -powif32 | No | | -powif64 | No | | +powif32 | Partial | Results are overapproximated | +powif64 | Partial | Results are overapproximated | pref_align_of | Yes | | prefetch_read_data | No | | prefetch_read_instruction | No | | diff --git a/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs b/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs index 3412cba290d2..6db8bc15beb0 100644 --- a/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs +++ b/kani-compiler/src/codegen_cprover_gotoc/codegen/intrinsic.rs @@ -476,8 +476,8 @@ impl<'tcx> GotocCtx<'tcx> { ), "powf32" => unstable_codegen!(codegen_simple_intrinsic!(Powf)), "powf64" => unstable_codegen!(codegen_simple_intrinsic!(Pow)), - "powif32" => unstable_codegen!(codegen_simple_intrinsic!(Powif)), - "powif64" => unstable_codegen!(codegen_simple_intrinsic!(Powi)), + "powif32" => codegen_simple_intrinsic!(Powif), + "powif64" => codegen_simple_intrinsic!(Powi), "pref_align_of" => codegen_intrinsic_const!(), "ptr_guaranteed_cmp" => self.codegen_ptr_guaranteed_cmp(fargs, place), "ptr_offset_from" => self.codegen_ptr_offset_from(fargs, place, loc), diff --git a/tests/kani/Intrinsics/Math/Arith/powi.rs b/tests/kani/Intrinsics/Math/Arith/powi.rs new file mode 100644 index 000000000000..70d9d8b0d46b --- /dev/null +++ b/tests/kani/Intrinsics/Math/Arith/powi.rs @@ -0,0 +1,18 @@ +// Copyright Kani Contributors +// SPDX-License-Identifier: Apache-2.0 OR MIT + +#[kani::proof] +fn verify_powi32() { + let x: f32 = kani::any(); + kani::assume(x.is_normal()); + let x2 = x.powi(2); + assert!(x2 >= 0.0); +} + +#[kani::proof] +fn verify_powi64() { + let x: f64 = kani::any(); + kani::assume(x.is_normal()); + let x2 = x.powi(2); + assert!(x2 >= 0.0); +} From e9ef0f891df7bfcd015428ef1f3dfea6836eba57 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 2 Aug 2024 12:50:15 +0000 Subject: [PATCH 2/4] Adjust precision --- tests/kani/Intrinsics/Math/Arith/powi.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/kani/Intrinsics/Math/Arith/powi.rs b/tests/kani/Intrinsics/Math/Arith/powi.rs index 70d9d8b0d46b..c7986d18a9ef 100644 --- a/tests/kani/Intrinsics/Math/Arith/powi.rs +++ b/tests/kani/Intrinsics/Math/Arith/powi.rs @@ -5,6 +5,8 @@ fn verify_powi32() { let x: f32 = kani::any(); kani::assume(x.is_normal()); + kani::assume(x >= 1e-19 || x <= -1e-19); + kani::assume(x <= 1.84e19 && x >= -1.84e19); let x2 = x.powi(2); assert!(x2 >= 0.0); } @@ -13,6 +15,8 @@ fn verify_powi32() { fn verify_powi64() { let x: f64 = kani::any(); kani::assume(x.is_normal()); + kani::assume(x >= 1e-153 || x <= -1e-153); + kani::assume(x <= 1.34e154 && x >= -1.34e154); let x2 = x.powi(2); assert!(x2 >= 0.0); } From 75fefa9761336e961fdc59b7f8c1b42f5dbae5b9 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 2 Aug 2024 13:59:55 +0000 Subject: [PATCH 3/4] fixme test no longer is a fixme-test --- ...2.rs => cast_abstract_args_to_concrete.rs} | 0 .../cast_abstract_args_to_concrete_fixme.rs | 24 ------------------- 2 files changed, 24 deletions(-) rename tests/kani/Cast/{cast_abstract_args_to_concrete_fixme2.rs => cast_abstract_args_to_concrete.rs} (100%) delete mode 100644 tests/kani/Cast/cast_abstract_args_to_concrete_fixme.rs diff --git a/tests/kani/Cast/cast_abstract_args_to_concrete_fixme2.rs b/tests/kani/Cast/cast_abstract_args_to_concrete.rs similarity index 100% rename from tests/kani/Cast/cast_abstract_args_to_concrete_fixme2.rs rename to tests/kani/Cast/cast_abstract_args_to_concrete.rs diff --git a/tests/kani/Cast/cast_abstract_args_to_concrete_fixme.rs b/tests/kani/Cast/cast_abstract_args_to_concrete_fixme.rs deleted file mode 100644 index faeb74c5d66a..000000000000 --- a/tests/kani/Cast/cast_abstract_args_to_concrete_fixme.rs +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright Kani Contributors -// SPDX-License-Identifier: Apache-2.0 OR MIT - -//! This test is a modified version of cast_abstract_args_to_concrete_fixme.rs. -//! The original test requires --no-undefined-function-checks to pass. This is an issue that -//! require investigation. See https://github.com/model-checking/kani/issues/555. -//! -//! Once this issue is fixed. Please remove this test and remove the kani flag from the original -//! test: --no-undefined-function-check - -fn main() { - let _x32 = 1.0f32.powi(2); - let _x64 = 1.0f64.powi(2); - - unsafe { - let size: libc::size_t = mem::size_of::(); - let my_num: *mut libc::c_void = libc::malloc(size); - if my_num.is_null() { - panic!("failed to allocate memory"); - } - let my_num2 = libc::memset(my_num, 1, size); - libc::free(my_num); - } -} From af32ddd057c1c6dcc9ae3e20c0e0c5bb5b91b66e Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Fri, 2 Aug 2024 14:05:44 +0000 Subject: [PATCH 4/4] Remove unnecessary check --- tests/kani/Cast/cast_abstract_args_to_concrete.rs | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/kani/Cast/cast_abstract_args_to_concrete.rs b/tests/kani/Cast/cast_abstract_args_to_concrete.rs index 51067e0e0a73..6694f799493a 100644 --- a/tests/kani/Cast/cast_abstract_args_to_concrete.rs +++ b/tests/kani/Cast/cast_abstract_args_to_concrete.rs @@ -1,9 +1,6 @@ // Copyright Kani Contributors // SPDX-License-Identifier: Apache-2.0 OR MIT -// https://github.com/model-checking/kani/issues/555 -// kani-flags: --no-undefined-function-checks - // This regression test is in response to issue #135. // The type of the second parameter to powi is a `CInteger`, but // the type of `2` here is a `u32`. This test ensures that