diff --git a/Makefile.am b/Makefile.am index 96836137..08dd01ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,5 @@ bin_PROGRAMS = snapraid check_PROGRAMS = mktest -EXTRA_PROGRAMS = mktables snapraid_SOURCES = \ raid/raid.c \ @@ -38,9 +37,6 @@ snapraid_SOURCES = \ mingw.c \ unix.c -mktables_SOURCES = \ - raid/mktables.c - noinst_HEADERS = \ raid/raid.h \ raid/helper.h \ @@ -92,7 +88,13 @@ EXTRA_DIST = \ test-par1.conf test-par2.conf test-par3.conf test-par4.conf test-par5.conf test-par6.conf test-par6-hole.conf \ snapraid.conf.example \ configure.windows-x86 configure.windows-x64 snapraid.conf.example.windows \ - acinclude.m4 + acinclude.m4 \ + raid/COPYING \ + raid/test/Makefile \ + raid/test/fulltest.c \ + raid/test/selftest.c \ + raid/test/speedtest.c \ + raid/test/invtest.c man_MANS = snapraid.1 diff --git a/portable.h b/portable.h index 0e973e0c..fb76db90 100644 --- a/portable.h +++ b/portable.h @@ -186,20 +186,6 @@ #include "unix.h" #endif -/** - * Missing __always_inline, like in MINGW. - */ -#ifndef __always_inline -#define __always_inline inline __attribute__((always_inline)) -#endif - -/** - * Missing __aligned, like in user mode. - */ -#ifndef __aligned -#define __aligned(a) __attribute__((aligned(a))) -#endif - /** * Another name for link() to avoid confusion with local variables called "link". */ diff --git a/raid/COPYING b/raid/COPYING new file mode 100644 index 00000000..a43ea212 --- /dev/null +++ b/raid/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) 19yy + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/raid/combo.h b/raid/combo.h index 31530a20..30ae7b71 100644 --- a/raid/combo.h +++ b/raid/combo.h @@ -37,7 +37,7 @@ * for(i[R-1]=0;i[R-1] +#include +#include +#include +#include + +#ifndef BUG_ON #define BUG_ON(a) assert(!(a)) +#endif + +#ifndef __always_inline +#define __always_inline inline __attribute__((always_inline)) +#endif + +#ifndef __aligned +#define __aligned(a) __attribute__((aligned(a))) +#endif /* * Includes the headers. diff --git a/raid/test/Makefile b/raid/test/Makefile new file mode 100644 index 00000000..6c008921 --- /dev/null +++ b/raid/test/Makefile @@ -0,0 +1,72 @@ +# +# Test programs for the RAID library +# +# selftest - Runs the same selftest and speedtest executed at the module startup. +# fulltest - Runs a more extensive test that checks all the built-in functions. +# speetest - Runs a more complete speed test. +# invtest - Runs an extensive matrix inversion test of all the 377.342.351.231 +# possible square submatrices of the Cauchy matrix used. +# covtest - Runs a coverage test. +# + +CC = gcc +CFLAGS = -I.. -Wall -Wextra -g +ifeq ($(COVERAGE),) +CFLAGS += -O2 +else +CFLAGS += -O0 --coverage -DCOVERAGE=1 +endif +LD = ld +OBJS = raid.o int.o intz.o x86.o x86z.o tables.o memory.o test.o helper.o module.o tag.o + +%.o: ../%.c + $(CC) $(CFLAGS) -c -o $@ $< + +all: fulltest speedtest selftest invtest + +fulltest: $(OBJS) fulltest.o + $(CC) $(CFLAGS) -o fulltest $^ + +speedtest: $(OBJS) speedtest.o + $(CC) $(CFLAGS) -o speedtest $^ + +selftest: $(OBJS) selftest.o + $(CC) $(CFLAGS) -o selftest $^ + +invtest: $(OBJS) invtest.o + $(CC) $(CFLAGS) -o invtest $^ + +mktables: mktables.o + $(CC) $(CFLAGS) -o mktables $^ + +tables.c: mktables + ./mktables > tables.c + +# Use this target to run a coverage test using lcov +covtest: + $(MAKE) clean + $(MAKE) lcov_reset + $(MAKE) COVERAGE=1 all + ./fulltest + ./speedtest + ./selftest + $(MAKE) lcov_capture + $(MAKE) lcov_html + +lcov_reset: + lcov --directory . -z + rm -f lcov.info + +lcov_capture: + lcov --directory . --capture --rc lcov_branch_coverage=1 -o lcov.info + +lcov_html: + rm -rf coverage + mkdir coverage + genhtml --branch-coverage -o coverage lcov.info + +clean: + rm -f *.o mktables fulltest speedtest selftest invtest + rm -f *.gcda *.gcno lcov.info + rm -rf coverage + diff --git a/raid/test/fulltest.c b/raid/test/fulltest.c new file mode 100644 index 00000000..c4918bac --- /dev/null +++ b/raid/test/fulltest.c @@ -0,0 +1,88 @@ +/* + * Copyright (C) 2013 Andrea Mazzoleni + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* Full sanity test for the RAID library */ + +#include "internal.h" +#include "test.h" +#include "cpu.h" + +#include +#include + +/* + * Size of the blocks to test. + */ +#define TEST_SIZE 256 + +/** + * Number of disks in the long parity test. + */ +#ifdef COVERAGE +#define TEST_COUNT 10 +#else +#define TEST_COUNT 32 +#endif + +int main(void) +{ + printf("Full sanity test for the RAID Cauchy library\n\n"); + + raid_init(); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) + printf("Including x86 SSE2 functions\n"); + if (raid_cpu_has_ssse3()) + printf("Including x86 SSSE3 functions\n"); +#endif +#ifdef CONFIG_X86_64 + printf("Including x64 extended SSE register set\n"); +#endif + + printf("\nPlease wait about 60 seconds...\n\n"); + + printf("Test sorting...\n"); + if (raid_test_sort() != 0) + goto bail; + printf("Test insertion...\n"); + if (raid_test_insert() != 0) + goto bail; + printf("Test combinations/permutations...\n"); + if (raid_test_combo() != 0) + goto bail; + printf("Test Cauchy parity generation with %u data disks...\n", RAID_DATA_MAX); + if (raid_test_par(RAID_MODE_CAUCHY, RAID_DATA_MAX, TEST_SIZE) != 0) + goto bail; + printf("Test Cauchy parity generation with 1 data disk...\n"); + if (raid_test_par(RAID_MODE_CAUCHY, 1, TEST_SIZE) != 0) + goto bail; + printf("Test Cauchy recovering with all combinations of %u data and 6 parity blocks...\n", TEST_COUNT); + if (raid_test_rec(RAID_MODE_CAUCHY, TEST_COUNT, TEST_SIZE) != 0) + goto bail; + printf("Test Vandermonde parity generation with %u data disks...\n", RAID_DATA_MAX); + if (raid_test_par(RAID_MODE_VANDERMONDE, RAID_DATA_MAX, TEST_SIZE) != 0) + goto bail; + printf("Test Vandermonde recovering with all combinations of %u data and 3 parity blocks...\n", TEST_COUNT); + if (raid_test_rec(RAID_MODE_VANDERMONDE, TEST_COUNT, TEST_SIZE) != 0) + goto bail; + + printf("OK\n"); + return 0; + +bail: + printf("FAILED!\n"); + exit(EXIT_FAILURE); +} + diff --git a/raid/test/invtest.c b/raid/test/invtest.c new file mode 100644 index 00000000..180a0527 --- /dev/null +++ b/raid/test/invtest.c @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2013 Andrea Mazzoleni + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* Matrix inversion test for the RAID library */ + +#include "internal.h" + +#include "combo.h" +#include "gf.h" + +#include +#include +#include + +/** + * Like raid_invert() but optimized to only check if the matrix is + * invertible. + */ +static __always_inline int raid_invert_fast(uint8_t *M, int n) +{ + int i, j, k; + + /* for each element in the diagonal */ + for (k = 0; k < n; ++k) { + uint8_t f; + + /* the diagonal element cannot be 0 because */ + /* we are inverting matrices with all the square */ + /* submatrices not singular */ + if (M[k*n+k] == 0) + return -1; + + /* make the diagonal element to be 1 */ + f = inv(M[k*n+k]); + for (j = 0; j < n; ++j) + M[k*n+j] = mul(f, M[k*n+j]); + + /* make all the elements over and under the diagonal */ + /* to be zero */ + for (i = 0; i < n; ++i) { + if (i == k) + continue; + f = M[i*n+k]; + for (j = 0; j < n; ++j) + M[i*n+j] ^= mul(f, M[k*n+j]); + } + } + + return 0; +} + +#define TEST_REFRESH (4*1024*1024) + +/** + * Precomputed number of square submatrices of size nr. + * + * It's bc(np,nr) * bc(nd,nr) + * + * With 1<=nr<=6 and bc(n, r) == binomial coefficient of (n over r). + */ +long long EXPECTED[RAID_PARITY_MAX] = { + 1506LL, + 470625LL, + 52082500LL, + 2421836250LL, + 47855484300LL, + 327012476050LL +}; + +static __always_inline int test_sub_matrix(int nr, long long *total) +{ + uint8_t M[RAID_PARITY_MAX * RAID_PARITY_MAX]; + int np = RAID_PARITY_MAX; + int nd = RAID_DATA_MAX; + int ip[RAID_PARITY_MAX]; + int id[RAID_DATA_MAX]; + long long count; + long long expected; + + printf("\n%ux%u\n", nr, nr); + + count = 0; + expected = EXPECTED[nr - 1]; + + /* all combinations (nr of nd) disks */ + combination_first(nr, nd, id); + do { + /* all combinations (nr of np) parities */ + combination_first(nr, np, ip); + do { + int i, j; + + /* setup the submatrix */ + for (i = 0; i < nr; ++i) + for (j = 0; j < nr; ++j) + M[i*nr+j] = gfgen[ip[i]][id[j]]; + + /* invert */ + if (raid_invert_fast(M, nr) != 0) + return -1; + + if (++count % TEST_REFRESH == 0) { + printf("\r%.3f %%", count * (double)100 / expected); + fflush(stdout); + } + } while (combination_next(nr, np, ip)); + } while (combination_next(nr, nd, id)); + + if (count != expected) + return -1; + + printf("\rTested %lld matrix\n", count); + + *total += count; + + return 0; +} + +int test_all_sub_matrix(void) +{ + long long total; + + printf("Invert all square submatrices of the %dx%d Cauchy matrix\n", + RAID_PARITY_MAX, RAID_DATA_MAX); + + printf("\nPlease wait about 2 days...\n"); + + total = 0; + + /* force inlining of everything */ + if (test_sub_matrix(1, &total) != 0) + return -1; + if (test_sub_matrix(2, &total) != 0) + return -1; + if (test_sub_matrix(3, &total) != 0) + return -1; + if (test_sub_matrix(4, &total) != 0) + return -1; + if (test_sub_matrix(5, &total) != 0) + return -1; + if (test_sub_matrix(6, &total) != 0) + return -1; + + printf("\nTested in total %lld matrix\n", total); + + return 0; +} + +int main(void) +{ + printf("Matrix inversion test for the RAID Cauchy library\n\n"); + + if (test_all_sub_matrix() != 0) { + printf("FAILED!\n"); + exit(EXIT_FAILURE); + } + printf("OK\n"); + + return 0; +} + diff --git a/raid/test/selftest.c b/raid/test/selftest.c new file mode 100644 index 00000000..1fe6bf43 --- /dev/null +++ b/raid/test/selftest.c @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2013 Andrea Mazzoleni + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* Self sanity test for the RAID library */ + +#include "internal.h" +#include "cpu.h" + +#include +#include + +int main(void) +{ + printf("Self sanity test for the RAID Cauchy library\n\n"); + + raid_init(); + + printf("Self test...\n"); + if (raid_selftest() != 0) { + printf("FAILED!\n"); + exit(EXIT_FAILURE); + } + printf("OK\n\n"); + + return 0; +} + diff --git a/raid/test/speedtest.c b/raid/test/speedtest.c new file mode 100644 index 00000000..6cdfb1c9 --- /dev/null +++ b/raid/test/speedtest.c @@ -0,0 +1,638 @@ +/* + * Copyright (C) 2013 Andrea Mazzoleni + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/* Speed test for the RAID library */ + +#include "internal.h" +#include "memory.h" +#include "cpu.h" + +#include +#include +#include + +/* + * Size of the blocks to test. + */ +#define TEST_SIZE (256*1024) + +/* + * Number of data blocks to test. + */ +#define TEST_COUNT (8) + +/** + * Differential us of two timeval. + */ +static int64_t diffgettimeofday(struct timeval *start, struct timeval *stop) +{ + int64_t d; + + d = 1000000LL * (stop->tv_sec - start->tv_sec); + d += stop->tv_usec - start->tv_usec; + + return d; +} + +/** + * Test period. + */ +#ifdef COVERAGE +#define TEST_PERIOD 100000LL +#define TEST_DELTA 1 +#else +#define TEST_PERIOD 1000000LL +#define TEST_DELTA 10 +#endif + +/** + * Start time measurement. + */ +#define SPEED_START \ + count = 0; \ + gettimeofday(&start, 0); \ + do { \ + for (i = 0; i < delta; ++i) + +/** + * Stop time measurement. + */ +#define SPEED_STOP \ + count += delta; \ + gettimeofday(&stop, 0); \ + } while (diffgettimeofday(&start, &stop) < TEST_PERIOD); \ + ds = size * (int64_t)count * nd; \ + dt = diffgettimeofday(&start, &stop); + +void speed(void) +{ + struct timeval start; + struct timeval stop; + int64_t ds; + int64_t dt; + int i, j; + int id[RAID_PARITY_MAX]; + int ip[RAID_PARITY_MAX]; + int count; + int delta = TEST_DELTA; + int size = TEST_SIZE; + int nd = TEST_COUNT; + int nv; + void *v_alloc; + void **v; + + nv = nd + RAID_PARITY_MAX + 1; + + v = raid_malloc_vector(nd, nv, size, &v_alloc); + + /* initialize disks with fixed data */ + for (i = 0; i < nd; ++i) + memset(v[i], i, size); + + /* zero buffer */ + memset(v[nd+RAID_PARITY_MAX], 0, size); + raid_zero(v[nd+RAID_PARITY_MAX]); + + /* basic disks and parity mapping */ + for (i = 0; i < RAID_PARITY_MAX; ++i) { + id[i] = i; + ip[i] = i; + } + + printf("Speed test using %u data buffers of %u bytes, for a total of %u KiB.\n", nd, size, nd * size / 1024); + printf("Memory blocks have a displacement of %u bytes to improve cache performance.\n", RAID_MALLOC_DISPLACEMENT); + printf("The reported value is the aggregate bandwidth of all data blocks in MiB/s,\n"); + printf("not counting parity blocks.\n"); + printf("\n"); + + printf("Memory write speed using the C memset() function:\n"); + printf("%8s", "memset"); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + memset(v[j], j, size); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + printf("\n"); + printf("\n"); + + /* RAID table */ + printf("RAID functions used for computing the parity:\n"); + printf("%8s", ""); + printf("%8s", "best"); + printf("%8s", "int8"); + printf("%8s", "int32"); + printf("%8s", "int64"); +#ifdef CONFIG_X86 + printf("%8s", "sse2"); +#ifdef CONFIG_X86_64 + printf("%8s", "sse2e"); +#endif + printf("%8s", "ssse3"); +#ifdef CONFIG_X86_64 + printf("%8s", "ssse3e"); +#endif +#endif + printf("\n"); + + /* GEN1 */ + printf("%8s", "gen1"); + printf("%8s", raid_gen1_tag()); + fflush(stdout); + + printf("%8s", ""); + + SPEED_START { + raid_gen1_int32(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + SPEED_START { + raid_gen1_int64(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + SPEED_START { + raid_gen1_sse2(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + } +#endif + printf("\n"); + + /* GEN2 */ + printf("%8s", "gen2"); + printf("%8s", raid_gen2_tag()); + fflush(stdout); + + printf("%8s", ""); + + SPEED_START { + raid_gen2_int32(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + SPEED_START { + raid_gen2_int64(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + SPEED_START { + raid_gen2_sse2(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_gen2_sse2ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + + /* GENz */ + printf("%8s", "genz"); + printf("%8s", raid_genz_tag()); + fflush(stdout); + + printf("%8s", ""); + + SPEED_START { + raid_genz_int32(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + SPEED_START { + raid_genz_int64(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + SPEED_START { + raid_genz_sse2(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_genz_sse2ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + + /* GEN3 */ + printf("%8s", "gen3"); + printf("%8s", raid_gen3_tag()); + fflush(stdout); + + SPEED_START { + raid_gen3_int8(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + printf("%8s", ""); + printf("%8s", ""); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + printf("%8s", ""); + +#ifdef CONFIG_X86_64 + printf("%8s", ""); +#endif + } +#endif + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + raid_gen3_ssse3(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_gen3_ssse3ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + + /* GEN4 */ + printf("%8s", "gen4"); + printf("%8s", raid_gen4_tag()); + fflush(stdout); + + SPEED_START { + raid_gen4_int8(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + printf("%8s", ""); + printf("%8s", ""); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + printf("%8s", ""); + +#ifdef CONFIG_X86_64 + printf("%8s", ""); +#endif + } +#endif + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + raid_gen4_ssse3(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_gen4_ssse3ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + + /* GEN5 */ + printf("%8s", "gen5"); + printf("%8s", raid_gen5_tag()); + fflush(stdout); + + SPEED_START { + raid_gen5_int8(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + printf("%8s", ""); + printf("%8s", ""); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + printf("%8s", ""); + +#ifdef CONFIG_X86_64 + printf("%8s", ""); +#endif + } +#endif + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + raid_gen5_ssse3(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_gen5_ssse3ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + + /* GEN6 */ + printf("%8s", "gen6"); + printf("%8s", raid_gen6_tag()); + fflush(stdout); + + SPEED_START { + raid_gen6_int8(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + + printf("%8s", ""); + printf("%8s", ""); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) { + printf("%8s", ""); + +#ifdef CONFIG_X86_64 + printf("%8s", ""); +#endif + } +#endif + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + raid_gen6_ssse3(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86_64 + SPEED_START { + raid_gen6_ssse3ext(nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); +#endif + } +#endif + printf("\n"); + printf("\n"); + + /* recover table */ + printf("RAID functions used for recovering:\n"); + printf("%8s", ""); + printf("%8s", "best"); + printf("%8s", "int8"); +#ifdef CONFIG_X86 + printf("%8s", "ssse3"); +#endif + printf("\n"); + + printf("%8s", "rec1"); + printf("%8s", raid_rec1_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + /* +1 to avoid GEN1 optimized case */ + raid_rec1_int8(1, id, ip + 1, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + /* +1 to avoid GEN1 optimized case */ + raid_rec1_ssse3(1, id, ip + 1, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + + printf("%8s", "rec2"); + printf("%8s", raid_rec2_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + /* +1 to avoid GEN2 optimized case */ + raid_rec2_int8(2, id, ip + 1, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + /* +1 to avoid GEN2 optimized case */ + raid_rec2_ssse3(2, id, ip + 1, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + + printf("%8s", "rec3"); + printf("%8s", raid_recX_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_int8(3, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_ssse3(3, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + + printf("%8s", "rec4"); + printf("%8s", raid_recX_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_int8(4, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_ssse3(4, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + + printf("%8s", "rec5"); + printf("%8s", raid_recX_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_int8(5, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_ssse3(5, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + + printf("%8s", "rec6"); + printf("%8s", raid_recX_tag()); + fflush(stdout); + + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_int8(6, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + fflush(stdout); + +#ifdef CONFIG_X86 + if (raid_cpu_has_ssse3()) { + SPEED_START { + for (j = 0; j < nd; ++j) + raid_recX_ssse3(6, id, ip, nd, size, v); + } SPEED_STOP + + printf("%8"PRIu64, ds / dt); + } +#endif + printf("\n"); + printf("\n"); + + free(v_alloc); + free(v); +} + +int main(void) +{ + printf("Speed test for the RAID Cauchy library\n\n"); + + raid_init(); + +#ifdef CONFIG_X86 + if (raid_cpu_has_sse2()) + printf("Including x86 SSE2 functions\n"); + if (raid_cpu_has_ssse3()) + printf("Including x86 SSSE3 functions\n"); +#endif +#ifdef CONFIG_X86_64 + printf("Including x64 extended SSE register set\n"); +#endif + + printf("\nPlease wait about 30 seconds...\n\n"); + + speed(); + + return 0; +} + diff --git a/speed.c b/speed.c index 07a64e84..fa8261d2 100644 --- a/speed.c +++ b/speed.c @@ -30,6 +30,11 @@ */ #define TEST_SIZE (256*1024) +/* + * Number of data blocks to test. + */ +#define TEST_COUNT (8) + /** * Differential us of two timeval. */ @@ -76,7 +81,7 @@ void speed(int period) int count; int delta = period >= 1000 ? 10 : 1; int size = TEST_SIZE; - int nd = 8; + int nd = TEST_COUNT; int nv; void *v_alloc; void **v; @@ -89,7 +94,7 @@ void speed(int period) for (i = 0; i < nd; ++i) memset(v[i], i, size); - /* zero v */ + /* zero buffer */ memset(v[nd+RAID_PARITY_MAX], 0, size); raid_zero(v[nd+RAID_PARITY_MAX]);