Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Added Parity() to the Q# library, and the tests. #531

Merged
kuzminrobin merged 4 commits into from
Feb 26, 2021
Merged

Added Parity() to the Q# library, and the tests. #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0095bf
Cleanup, adding Parity().
kuzminrobin Feb 24, 2021
64e9d8c
Added Parity().
kuzminrobin Feb 24, 2021
cfa5d56
CR changes.
kuzminrobin Feb 25, 2021
af54e13
CR changes.
kuzminrobin Feb 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AdvantageBenchmark/privateBuild/host.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">
<!-- Add project references to Simulator and other required packages: -->
<Import Project="..\..\src\Simulation\Common\Simulators.Dev.props" />

Expand Down
2 changes: 1 addition & 1 deletion AdvantageBenchmark/releasedBuild/quantum/quantum.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2101126940">
<Project Sdk="Microsoft.Quantum.Sdk/0.15.2102129527-alpha">

<ItemGroup>
<QSharpCompile Include="..\..\privateBuild\quantum.qs" />
Expand Down
1 change: 1 addition & 0 deletions src/QirRuntime/test/QIR-static/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ add_executable(qir-static-tests
qir-test-math.cpp
qir-test-strings.cpp
qir-test-ouput.cpp
qir-test-other.cpp
)

target_link_libraries(qir-static-tests PUBLIC
Expand Down
11 changes: 11 additions & 0 deletions src/QirRuntime/test/QIR-static/qir-test-other.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

#include "catch.hpp"

extern "C" uint64_t Microsoft__Quantum__Testing__QIR__Other__ParityTest__body(); // NOLINT

TEST_CASE("QIR: Other.Parity", "[qir.Other][qir.Other.Parity]")
{
REQUIRE(0 == Microsoft__Quantum__Testing__QIR__Other__ParityTest__body());
}
2 changes: 2 additions & 0 deletions src/QirRuntime/test/QIR-static/qsharp/qir-test-arrays.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Licensed under the MIT License.

namespace Microsoft.Quantum.Testing.QIR {
open Microsoft.Quantum.Testing.QIR.Other;
open Microsoft.Quantum.Testing.QIR.Math;
open Microsoft.Quantum.Testing.QIR.Str;
open Microsoft.Quantum.Testing.QIR.Out;
Expand Down Expand Up @@ -53,6 +54,7 @@ namespace Microsoft.Quantum.Testing.QIR {
let res16 = ArcSinTest();
let res17 = ArcCosTest();
let res18 = ArcTanTest();
let res19 = ParityTest();
MessageTest("Test");

// Conditionals:
Expand Down
44 changes: 0 additions & 44 deletions src/QirRuntime/test/QIR-static/qsharp/qir-test-math.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,49 +273,6 @@ namespace Microsoft.Quantum.Testing.QIR.Math {
return 0;
}

// Remove when the Q# compiler bug https://github.com/microsoft/qsharp-compiler/issues/877 is resolved:
//function MyRound(value : Double) : Int { // 4.x 4.5 5.x 5.5 -4.x -4.5 -5.x -5.5
//
// // Temporary piece of code to test a Q# compiler bug:
//
// let truncated = Truncate(value); // 4 4 5 5 -4 -4 -5 -5
// if truncated >= 0 {
// let diff = value - IntAsDouble(truncated); // 0.x 0.5 0.x 0.5 diff
// if diff < 0.5 { return truncated; } // 4 5 return
// if diff > 0.5 { return (truncated + 1); } // 5 6 return
// if truncated % 2 == 0 { return truncated; } // 4 return
// else { return truncated + 1; } // 6 return
// }
// else {
// let diff = IntAsDouble(truncated) - value; // 0.x 0.5 0.x 0.5 diff
// if diff < 0.5 { return truncated; } // -4 -5
// if diff > 0.5 { return (truncated - 1); } // -5 -6
// if truncated % 2 == 0 { return truncated; } // -4
// else { return truncated - 1; } // -6
// }
//
// // End of temporary piece of code.
//
//
// // Temporary piece of code to work around the clang++ crash upon `Round()` (resolved in `0.15.2102129370-alpha`):
//
// //let truncated = Truncate(value); // 4 4 5 5 -4 -4 -5 -5
// //if truncated >= 0 {
// // let diff = value - IntAsDouble(truncated); // 0.x 0.5 0.x 0.5 diff
// // if diff < 0.5 { return truncated; } // 4 5 return
// // if diff > 0.5 { return (truncated + 1); } // 5 6 return
// // if truncated % 2 == 0 { return truncated; } // 4 return
// // return truncated + 1; // 6 return
// //}
// //let diff2 = IntAsDouble(truncated) - value; // 0.x 0.5 0.x 0.5 diff
// //if diff2 < 0.5 { return truncated; } // -4 -5
// //if diff2 > 0.5 { return (truncated - 1); } // -5 -6
// //if truncated % 2 == 0 { return truncated; } // -4
// //return truncated - 1; // -6
//
// // End of temporary piece of code to work around the clang++ crash.
//}

function IeeeRemainderTest() : Int {

// function IeeeRemainder(x : Double, y : Double) : Double
Expand All @@ -332,7 +289,6 @@ namespace Microsoft.Quantum.Testing.QIR.Math {
// the `remainder` and `IEEERemainder()` calculated below.
// That is normal but we avoid that.
let remainder = dividend - (divisor * IntAsDouble(Round(dividend / divisor)));
//MyRound(dividend / divisor))); // Remove when the https://github.com/microsoft/qsharp-compiler/issues/877 is resolved.
if not Close(remainder, IEEERemainder(dividend, divisor)) {
Message(DoubleAsString(remainder)); // The output for the test faiulure analysis,
Message(DoubleAsString(dividend)); // if the failure happens.
Expand Down
27 changes: 27 additions & 0 deletions src/QirRuntime/test/QIR-static/qsharp/qir-test-other.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright (c) Microsoft Corporation.
// Licensed under the MIT License.

namespace Microsoft.Quantum.Testing.QIR.Other {

open Microsoft.Quantum.Bitwise;

function ParityTest() : Int {
//function Parity (a : Int) : Int
if 0 != Parity(0) { return 1; }
if 1 != Parity(1) { return 2; }
if 1 != Parity(2) { return 3; }
if 0 != Parity(3) { return 4; }
if 0 != Parity(0xFF) { return 5; }
if 1 != Parity(0x100) { return 6; }
if 0 != Parity(0xFFFF) { return 7; }
if 1 != Parity(0x10000) { return 8; }
if 1 != Parity(0x7F00000000000000) { return 9; }
if 0 != Parity(0x0F00000000000000) { return 10; }

if 0 != Parity(-1) { return 11; } // 0xFFFFFFFFFFFFFFFF
if 1 != Parity(-2) { return 12; } // 0xFFFFFFFFFFFFFFFE

return 0;
}

}
32 changes: 30 additions & 2 deletions src/Simulation/QSharpFoundation/Bitwise/Bitwise.qs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,43 @@ namespace Microsoft.Quantum.Bitwise {


/// # Summary
/// Returns the bitwise PARITY of an integer (1 if its binary representation contains odd number of ones and 0 otherwise).
/// Returns the bitwise PARITY of an integer.
///
/// # Description
/// This function returns the bitwise parity of the
/// [two's complement](https://en.wikipedia.org/wiki/Signed_number_representations#Two's_complement)
/// representation of its input, returning `1` if that representation
/// contains an odd number of ones, and returning `0` otherwise.
///
/// # Example
/// ```qsharp
/// let a = 248;
/// let x = Parity(a); // x : Int = 1.
/// ```
function Parity (a : Int) : Int {
body intrinsic;
mutable v = a;
// http://graphics.stanford.edu/~seander/bithacks.html#ParityMultiply
// XOR the bits in every 2-bit pair, save the result in the least significant bit (LSB) of the pair:
set v ^^^= (v >>> 1); // bit[0] = bit[0] ^ bit[1]; bit[2] = bit[2] ^ bit[3]; ..
// Now only the even bits contain the information.
// XOR the even bits in every 4-bit nibble, save the result in the LSB of the nibble:
set v ^^^= (v >>> 2); // bit[0] = bit[0] ^ bit[2]; bit[4] = bit[4] ^ bit[6]; ..
// Now only the LSB of each nibble contains the information.
set v =
(v &&& 0x1111111111111111) // In every 4-bit nibble clear (to '0') all the bits except the LSB.
* 0x1111111111111111; // Explanation with a 32-bit example:
// V (Down arrow) We are interested in the LSB of the most significant 4-bit nibble.
// 0x11111111 The multiplier `* 0x1111111111111111UL` above.
// * 0x10010011 The result of `(v & 0x1111111111111111UL)`, we will designate this value as (A).
// ----------
// 0x11111111
// + 0x11111111
// 0x11111111
// 0x1111111
//-----------------
// 4 The value in the most significant 4-bit nibble is equal to the number of 1s in (A),
// modulo 16. The LSB is 0.
return (v >>> 60) &&& 1; // Return the LSB of the most significant 4-bit nibble.
}

// Common implementation for XBits and ZBits.
Expand Down