iio: iio_format_value(): Use signed temporary for IIO_VAL_FRACTIONAL_LOG2
PATCH 1/3 iio: iio_format_value(): Use signed temporary for IIO_VAL_FRACTIONAL_LOG2
IIO_VAL_FRACTIONAL_LOG2 works with signed values, yet the temporary we use is unsigned. This works at the moment because the variable is implicitly cast to signed everywhere where it is used.
But it will certainly be cleaner to use a signed variable in the first place.
--- drivers/iio/industrialio-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/iio/industrialio-core.c +2 -3
@@ -592,7 +592,6 @@ EXPORT_SYMBOL(iio_read_mount_matrix);static ssize_t __iio_format_value (char *buf,size_t len,unsigned int type,int size,const int *vals) { -unsigned long long tmp;int tmp0, tmp1;s64 tmp2;bool scale_db = false;
@@ -625,8 +624,8 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,else return snprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_FRACTIONAL_LOG2 : - tmp =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); - tmp0 = (int )div_s64_rem (tmp,1000000000LL , &tmp1); + tmp2 =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); + tmp0 = (int )div_s64_rem (tmp2,1000000000LL , &tmp1);return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_INT_MULTIPLE : {
Signature · 1 line
2.20.1
PATCH 2/3 iio: iio_format_value(): Fix IIO_VAL_FRACTIONAL_LOG2 values between -1.0 and 0.0
When formatting a value using IIO_VAL_FRACTIONAL_LOG2 and the values is between -1 and 0 the sign is omitted.
We need the same trick as for IIO_VAL_FRACTIONAL to make sure this gets formatted correctly.
---
Found while writing a unit test for this.
Considering nobody complained we probably do not have an driver that will run into this issue at the moment. So this doesn't need to got to stable.
--- drivers/iio/industrialio-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/iio/industrialio-core.c +4 -1
@@ -626,7 +626,10 @@ static ssize_t __iio_format_value(char *buf, size_t len, unsigned int type,case IIO_VAL_FRACTIONAL_LOG2 : tmp2 =shift_right ((s64 )vals[0 ] *1000000000LL , vals[1 ]); tmp0 = (int )div_s64_rem (tmp2,1000000000LL , &tmp1); -return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1)); +if (tmp0 ==0 && tmp2 <0 ) +return snprintf (buf, len,"-0.%09u" ,abs (tmp1)); +else +return scnprintf (buf, len,"%d.%09u" , tmp0,abs (tmp1));case IIO_VAL_INT_MULTIPLE : {int i;
Signature · 1 line
2.20.1
PATCH 3/3 iio: Add basic unit test for iio_format_value()
In reply to Lars-Peter ClausenThe IIO core provides a function to do formatting of fixedpoint numbers.
In the past there have been some issues with the implementation of the function where for example negative numbers were not handled correctly.
Introduce a basic unit test based on kunit that tests the function and ensures that the generated output matches the expected output.
This gives us some confidence that future modifications to the function implementation will not break ABI compatibility.
To run the unit tests follow the kunit documentation and add
CONFIG_IIO=y
CONFIG_IIO_TEST_FORMAT=y
to the .kunitconfig and run
Quoted 1 line
./tools/testing/kunit/kunit.pyrun
Configuring KUnit Kernel ...
Building KUnit Kernel ...
Starting KUnit Kernel ...
============================================================
======== [PASSED] iio-format ========
[PASSED] iio_test_iio_format_value_integer
[PASSED] iio_test_iio_format_value_fixedpoint
[PASSED] iio_test_iio_format_value_fractional
[PASSED] iio_test_iio_format_value_fractional_log2
[PASSED] iio_test_iio_format_value_multiple
============================================================
Testing complete. 21 tests run. 0 failed. 0 crashed.
Elapsed time: 8.242s total, 0.001s configuring, 3.865s building, 0.000s running
--- drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/test/Kconfig | 9 ++ drivers/iio/test/Makefile | 7 + drivers/iio/test/iio-test-format.c | 198 +++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+) create mode 100644 drivers/iio/test/Kconfig create mode 100644 drivers/iio/test/Makefile create mode 100644 drivers/iio/test/iio-test-format.c
drivers/iio/Kconfig +1 -0
@@ -85,6 +85,7 @@ source "drivers/iio/light/Kconfig" source "drivers/iio/magnetometer/Kconfig" source "drivers/iio/multiplexer/Kconfig" source "drivers/iio/orientation/Kconfig" +source "drivers/iio/test/Kconfig" if IIO_TRIGGER source "drivers/iio/trigger/Kconfig" endif #IIO_TRIGGER
drivers/iio/Makefile +1 -0
@@ -38,4 +38,5 @@ obj-y += pressure/ obj-y += proximity/ obj-y += resolver/ obj-y += temperature/ +obj-y += test/ obj-y += trigger/
drivers/iio/test/Kconfig new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Industrial I/O subsystem unit tests configuration +# + +# Keep in alphabetical order +config IIO_TEST_FORMAT + bool "Test IIO formatting functions" + depends on KUNIT=y
drivers/iio/test/Makefile new file +7 -0
@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the industrial I/O unit tests. +# + +# Keep in alphabetical order +obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.o
drivers/iio/test/iio-test-format.c new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
2.20.1
Jonathan Cameron
maintainerRe: [PATCH 3/3] iio: Add basic unit test for iio_format_value()
Quoted 33 lines · On Tue, 15 Dec 2020 20:17:43 +0100 Lars-Peter Clausen <[email protected]> wrote:
The IIO core provides a function to do formatting of fixedpoint numbers.
In the past there have been some issues with the implementation of the function where for example negative numbers were not handled correctly.
Introduce a basic unit test based on kunit that tests the function and ensures that the generated output matches the expected output.
This gives us some confidence that future modifications to the function implementation will not break ABI compatibility.
To run the unit tests follow the kunit documentation and add
CONFIG_IIO=y
CONFIG_IIO_TEST_FORMAT=yto the .kunitconfig and run
Quoted 1 line
./tools/testing/kunit/kunit.pyrunConfiguring KUnit Kernel ...
Building KUnit Kernel ...
Starting KUnit Kernel ...
============================================================
======== [PASSED] iio-format ========
[PASSED]iio_test_iio_format_value_integer
[PASSED]iio_test_iio_format_value_fixedpoint
[PASSED]iio_test_iio_format_value_fractional
[PASSED]iio_test_iio_format_value_fractional_log2
[PASSED]iio_test_iio_format_value_multiple
============================================================
Testing complete. 21 tests run. 0 failed. 0 crashed.
Elapsed time: 8.242s total, 0.001s configuring, 3.865s building, 0.000s running
Quoted 1 line
Signed-off-by Lars-Peter Clausen <[email protected]>
Series looks good to me, but I wonder. What is convention wrt to MAINTAINERS / Acks etc for self tests?
Jonathan
Quoted 265 lines
--- drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/test/Kconfig | 9 ++ drivers/iio/test/Makefile | 7 + drivers/iio/test/iio-test-format.c | 198 +++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+) create mode 100644 drivers/iio/test/Kconfig create mode 100644 drivers/iio/test/Makefile create mode 100644 drivers/iio/test/iio-test-format.cdrivers/iio/Kconfig +1
-0@@ -85,6 +85,7 @@ source "drivers/iio/light/Kconfig" source "drivers/iio/magnetometer/Kconfig" source "drivers/iio/multiplexer/Kconfig" source "drivers/iio/orientation/Kconfig" +source "drivers/iio/test/Kconfig" if IIO_TRIGGER source "drivers/iio/trigger/Kconfig" endif #IIO_TRIGGERdrivers/iio/Makefile +1
-0@@ -38,4 +38,5 @@ obj-y += pressure/ obj-y += proximity/ obj-y += resolver/ obj-y += temperature/ +obj-y += test/ obj-y += trigger/drivers/iio/test/Kconfig new file +9
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Industrial I/O subsystem unit tests configuration +# + +# Keep in alphabetical order +config IIO_TEST_FORMAT + bool "Test IIO formatting functions" + depends on KUNIT=ydrivers/iio/test/Makefile new file +7
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the industrial I/O unit tests. +# + +# Keep in alphabetical order +obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.odrivers/iio/test/iio-test-format.c new file +198
-0@@ -0,0 +1,198 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Unit tests for IIO formatting functions +* +* Copyright (c) 2020 Lars-Peter Clausen <[email protected]> +*/ + +#include <kunit/test.h> +#include <linux/iio/iio.h> + +#define IIO_TEST_FORMAT_EXPECT_EQ (_test, _buf, _ret, _val) do { \ + KUNIT_EXPECT_EQ(_test, (int)strlen(_buf), _ret); \ + KUNIT_EXPECT_STREQ(_test, (_buf), (_val)); \ + } while (0) + +static void iio_test_iio_format_value_integer (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int val; +int ret; + + val =42 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"42\n" ); + + val =-23 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-23\n" ); + + val =0 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0\n" ); + + val =INT_MAX ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"2147483647\n" ); + + val =INT_MIN ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-2147483648\n" ); +} + +static void iio_test_iio_format_value_fixedpoint (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive >= 1 */ + values[0 ] =1 ; + values[1 ] =10 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000010\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000010 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000000010\n" ); + +/* positive < 1 */ + values[0 ] =0 ; + values[1 ] =12 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000012\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000012 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000012\n" ); + +/* negative <= -1 */ + values[0 ] =-1 ; + values[1 ] =10 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000010\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000010 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000000010\n" ); + +/* negative > -1 */ + values[0 ] =0 ; + values[1 ] =-123 ; + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000123\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000123 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000000123\n" ); +} + +static void iio_test_iio_format_value_fractional (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive < 1 */ + values[0 ] =1 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.100000000\n" ); + +/* positive >= 1 */ + values[0 ] =100 ; + values[1 ] =3 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"33.333333333\n" ); + +/* negative > -1 */ + values[0 ] =-1 ; + values[1 ] =1000000000 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000000001\n" ); + +/* negative <= -1 */ + values[0 ] =-200 ; + values[1 ] =3 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-66.666666666\n" ); + +/* Zero */ + values[0 ] =0 ; + values[1 ] =-10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000000\n" ); +} + +static void iio_test_iio_format_value_fractional_log2 (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive < 1 */ + values[0 ] =123 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.120117187\n" ); + +/* positive >= 1 */ + values[0 ] =1234567 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1205.631835937\n" ); + +/* negative > -1 */ + values[0 ] =-123 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.120117187\n" ); + +/* negative <= -1 */ + values[0 ] =-1234567 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1205.631835937\n" ); + +/* Zero */ + values[0 ] =0 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000000\n" ); +} + +static void iio_test_iio_format_value_multiple (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[] = {1 ,-2 ,3 ,-4 ,5 }; +int ret; + + ret =iio_format_value (buf,IIO_VAL_INT_MULTIPLE , +ARRAY_SIZE (values), values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1 -2 3 -4 5 \n" ); +} + +static struct kunit_case iio_format_test_cases[] = { +KUNIT_CASE (iio_test_iio_format_value_integer), +KUNIT_CASE (iio_test_iio_format_value_fixedpoint), +KUNIT_CASE (iio_test_iio_format_value_fractional), +KUNIT_CASE (iio_test_iio_format_value_fractional_log2), +KUNIT_CASE (iio_test_iio_format_value_multiple), + {} +}; + +static struct kunit_suite iio_format_test_suite = { + .name ="iio-format" , + .test_cases = iio_format_test_cases, +}; +kunit_test_suite (iio_format_test_suite);
Re: [PATCH 3/3] iio: Add basic unit test for iio_format_value()
Quoted 36 lines · Jonathan Cameron
Quoted 33 lines · On Tue, 15 Dec 2020 20:17:43 +0100 Lars-Peter Clausen <[email protected]> wrote:
The IIO core provides a function to do formatting of fixedpoint numbers.
In the past there have been some issues with the implementation of the function where for example negative numbers were not handled correctly.
Introduce a basic unit test based on kunit that tests the function and ensures that the generated output matches the expected output.
This gives us some confidence that future modifications to the function implementation will not break ABI compatibility.
To run the unit tests follow the kunit documentation and add
CONFIG_IIO=y
CONFIG_IIO_TEST_FORMAT=yto the .kunitconfig and run
Quoted 1 line
./tools/testing/kunit/kunit.pyrunConfiguring KUnit Kernel ...
Building KUnit Kernel ...
Starting KUnit Kernel ...
============================================================
======== [PASSED] iio-format ========
[PASSED]iio_test_iio_format_value_integer
[PASSED]iio_test_iio_format_value_fixedpoint
[PASSED]iio_test_iio_format_value_fractional
[PASSED]iio_test_iio_format_value_fractional_log2
[PASSED]iio_test_iio_format_value_multiple
============================================================
Testing complete. 21 tests run. 0 failed. 0 crashed.
Elapsed time: 8.242s total, 0.001s configuring, 3.865s building, 0.000s running
Quoted 3 lines
Quoted 1 line
Signed-off-by Lars-Peter Clausen <[email protected]>Series looks good to me, but I wonder. What is convention wrt to
MAINTAINERS/ Acks etc for self tests?
Let's ask Brendan.
Quoted 269 lines
Jonathan
Quoted 265 lines
--- drivers/iio/Kconfig | 1 + drivers/iio/Makefile | 1 + drivers/iio/test/Kconfig | 9 ++ drivers/iio/test/Makefile | 7 + drivers/iio/test/iio-test-format.c | 198 +++++++++++++++++++++++++++++ 5 files changed, 216 insertions(+)create mode 100644
drivers/iio/test/Kconfigcreate mode 100644drivers/iio/test/Makefilecreate mode 100644drivers/iio/test/iio-test-format.cdrivers/iio/Kconfig +1
-0@@ -85,6 +85,7 @@ source "drivers/iio/light/Kconfig" source "drivers/iio/magnetometer/Kconfig" source "drivers/iio/multiplexer/Kconfig" source "drivers/iio/orientation/Kconfig" +source "drivers/iio/test/Kconfig" if IIO_TRIGGER source "drivers/iio/trigger/Kconfig" endif #IIO_TRIGGERdrivers/iio/Makefile +1
-0@@ -38,4 +38,5 @@ obj-y += pressure/ obj-y += proximity/ obj-y += resolver/ obj-y += temperature/ +obj-y += test/ obj-y += trigger/drivers/iio/test/Kconfig new file +9
-0@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Industrial I/O subsystem unit tests configuration +# + +# Keep in alphabetical order +config IIO_TEST_FORMAT + bool "Test IIO formatting functions" + depends on KUNIT=ydrivers/iio/test/Makefile new file +7
-0@@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for the industrial I/O unit tests. +# + +# Keep in alphabetical order +obj-$(CONFIG_IIO_TEST_FORMAT) += iio-test-format.odrivers/iio/test/iio-test-format.c new file +198
-0@@ -0,0 +1,198 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Unit tests for IIO formatting functions +* +* Copyright (c) 2020 Lars-Peter Clausen <[email protected]> +*/ + +#include <kunit/test.h> +#include <linux/iio/iio.h> + +#define IIO_TEST_FORMAT_EXPECT_EQ (_test, _buf, _ret, _val) do { \ + KUNIT_EXPECT_EQ(_test, (int)strlen(_buf), _ret); \ + KUNIT_EXPECT_STREQ(_test, (_buf), (_val)); \ + } while (0) + +static void iio_test_iio_format_value_integer (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int val; +int ret; + + val =42 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"42\n" ); + + val =-23 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-23\n" ); + + val =0 ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0\n" ); + + val =INT_MAX ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"2147483647\n" ); + + val =INT_MIN ; + ret =iio_format_value (buf,IIO_VAL_INT ,1 , &val); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-2147483648\n" ); +} + +static void iio_test_iio_format_value_fixedpoint (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive >= 1 */ + values[0 ] =1 ; + values[1 ] =10 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000010\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000010 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1.000000010\n" ); + +/* positive < 1 */ + values[0 ] =0 ; + values[1 ] =12 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000012\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000012 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000012\n" ); + +/* negative <= -1 */ + values[0 ] =-1 ; + values[1 ] =10 ; + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000010\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000010 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1.000000010\n" ); + +/* negative > -1 */ + values[0 ] =0 ; + values[1 ] =-123 ; + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000123\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_MICRO_DB ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000123 dB\n" ); + + ret =iio_format_value (buf,IIO_VAL_INT_PLUS_NANO ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000000123\n" ); +} + +static void iio_test_iio_format_value_fractional (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive < 1 */ + values[0 ] =1 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.100000000\n" ); + +/* positive >= 1 */ + values[0 ] =100 ; + values[1 ] =3 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"33.333333333\n" ); + +/* negative > -1 */ + values[0 ] =-1 ; + values[1 ] =1000000000 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.000000001\n" ); + +/* negative <= -1 */ + values[0 ] =-200 ; + values[1 ] =3 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-66.666666666\n" ); + +/* Zero */ + values[0 ] =0 ; + values[1 ] =-10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000000\n" ); +} + +static void iio_test_iio_format_value_fractional_log2 (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[2 ]; +int ret; + +/* positive < 1 */ + values[0 ] =123 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.120117187\n" ); + +/* positive >= 1 */ + values[0 ] =1234567 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1205.631835937\n" ); + +/* negative > -1 */ + values[0 ] =-123 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-0.120117187\n" ); + +/* negative <= -1 */ + values[0 ] =-1234567 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"-1205.631835937\n" ); + +/* Zero */ + values[0 ] =0 ; + values[1 ] =10 ; + ret =iio_format_value (buf,IIO_VAL_FRACTIONAL_LOG2 ,2 , values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"0.000000000\n" ); +} + +static void iio_test_iio_format_value_multiple (struct kunit *test) +{ +char *buf =kunit_kmalloc (test,PAGE_SIZE ,GFP_KERNEL ); +int values[] = {1 ,-2 ,3 ,-4 ,5 }; +int ret; + + ret =iio_format_value (buf,IIO_VAL_INT_MULTIPLE , +ARRAY_SIZE (values), values); +IIO_TEST_FORMAT_EXPECT_EQ (test, buf, ret,"1 -2 3 -4 5 \n" ); +} + +static struct kunit_case iio_format_test_cases[] = { +KUNIT_CASE (iio_test_iio_format_value_integer), +KUNIT_CASE (iio_test_iio_format_value_fixedpoint), +KUNIT_CASE (iio_test_iio_format_value_fractional), +KUNIT_CASE (iio_test_iio_format_value_fractional_log2), +KUNIT_CASE (iio_test_iio_format_value_multiple), + {} +}; + +static struct kunit_suite iio_format_test_suite = { + .name ="iio-format" , + .test_cases = iio_format_test_cases, +}; +kunit_test_suite (iio_format_test_suite);
Re: [PATCH 3/3] iio: Add basic unit test for iio_format_value()
Quoted 37 lines · Lars-Peter Clausen
Quoted 36 lines · Jonathan Cameron
Quoted 33 lines · On Tue, 15 Dec 2020 20:17:43 +0100 Lars-Peter Clausen <[email protected]> wrote:
The IIO core provides a function to do formatting of fixedpoint numbers.
In the past there have been some issues with the implementation of the function where for example negative numbers were not handled correctly.
Introduce a basic unit test based on kunit that tests the function and ensures that the generated output matches the expected output.
This gives us some confidence that future modifications to the function implementation will not break ABI compatibility.
To run the unit tests follow the kunit documentation and add
CONFIG_IIO=y
CONFIG_IIO_TEST_FORMAT=yto the .kunitconfig and run
>
./tools/testing/kunit/kunit.pyrun
Configuring KUnit Kernel ...
Building KUnit Kernel ...
Starting KUnit Kernel ...
============================================================
======== [PASSED] iio-format ========
[PASSED]iio_test_iio_format_value_integer
[PASSED]iio_test_iio_format_value_fixedpoint
[PASSED]iio_test_iio_format_value_fractional
[PASSED]iio_test_iio_format_value_fractional_log2
[PASSED]iio_test_iio_format_value_multiple
============================================================
Testing complete. 21 tests run. 0 failed. 0 crashed.
Elapsed time: 8.242s total, 0.001s configuring, 3.865s building, 0.000s running
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Lars-Peter Clausen <[email protected]>Series looks good to me, but I wonder. What is convention wrt to
MAINTAINERS/ Acks etc for self tests?Let's ask Brendan.
Jonathan, since there hasn't been any additional feedback should we just apply this series?
Thanks,
- Lars
Jonathan Cameron
maintainerRe: [PATCH 3/3] iio: Add basic unit test for iio_format_value()
Quoted 40 lines · On Sun, 7 Feb 2021 13:45:02 +0100 Lars-Peter Clausen <[email protected]> wrote:
Quoted 39 lines · Lars-Peter Clausen
Quoted 38 lines · Jonathan Cameron
Quoted 35 lines · On Tue, 15 Dec 2020 20:17:43 +0100 Lars-Peter Clausen <[email protected]> wrote:
The IIO core provides a function to do formatting of fixedpoint numbers.
In the past there have been some issues with the implementation of the function where for example negative numbers were not handled correctly.
Introduce a basic unit test based on kunit that tests the function and ensures that the generated output matches the expected output.
This gives us some confidence that future modifications to the function implementation will not break ABI compatibility.
To run the unit tests follow the kunit documentation and add
CONFIG_IIO=y
CONFIG_IIO_TEST_FORMAT=yto the .kunitconfig and run
>
./tools/testing/kunit/kunit.pyrun
Configuring KUnit Kernel ...
Building KUnit Kernel ...
Starting KUnit Kernel ...
============================================================
======== [PASSED] iio-format ========
[PASSED]iio_test_iio_format_value_integer
[PASSED]iio_test_iio_format_value_fixedpoint[PASSED]iio_test_iio_format_value_fractional[PASSED]iio_test_iio_format_value_fractional_log2[PASSED]iio_test_iio_format_value_multiple
============================================================
Testing complete. 21 tests run. 0 failed. 0 crashed. Elapsed time: 8.242s total, 0.001s configuring, 3.865s building, 0.000s running
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Lars-Peter Clausen <[email protected]>Series looks good to me, but I wonder. What is convention wrt to
MAINTAINERS/ Acks etc for self tests?Let's ask Brendan.
Jonathan, since there hasn't been any additional feedback should we just apply this series?
Sure, it's been long enough.
Applied to the togreg branch of iio.git and pushed out as testing for all the normal reasons.
Thanks,
Jonathan
Quoted 4 lines
Thanks,
- Lars