diff --git a/examples_ptx/bitonicSort/bitonicSort.cpp b/examples_ptx/bitonicSort/bitonicSort.cpp index 21778d18..9ab8dc49 100644 --- a/examples_ptx/bitonicSort/bitonicSort.cpp +++ b/examples_ptx/bitonicSort/bitonicSort.cpp @@ -1,38 +1,3 @@ -/* - Copyright (c) 2013, Durham University - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - * Neither the name of Durham University nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER - OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -/* Author: Tomasz Koziara */ - #include #include #include @@ -41,11 +6,16 @@ #include #include "../timing.h" #include "../ispc_malloc.h" -#include "sort_ispc.h" +#include "bitonicSort_ispc.h" -using namespace ispc; - -extern void sort_serial (int n, unsigned int code[], int order[]); +extern void bitonicSort_serial ( + int dstKey[], + int dstVal[], + int srcKey[], + int srcVal[], + const int batchSize, + const int arrayLength, + const int dir); /* progress bar by Ross Hemsley; * http://www.rosshemsley.co.uk/2011/02/creating-a-progress-bar-in-c-or-any-other-console-app/ */