[Libclc-dev] [PATCH 2/8] Implement distance builtin

Tom Stellard tom at stellard.net
Thu Mar 12 15:24:23 PDT 2015 

On Tue, Mar 10, 2015 at 02:55:51PM -0500, Aaron Watry wrote:
> On Fri, Mar 6, 2015 at 7:01 PM, Tom Stellard <thomas.stellard at amd.com>
> wrote:
> 
> > This implementation was ported from the AMD builtin library
> > and has been tested with piglit, OpenCV, and the ocl conformance tests.
> > ---
> >  generic/include/clc/clc.h                  |  1 +
> >  generic/include/clc/geometric/distance.h   | 22 ++++++++++++++++++++++
> >  generic/include/clc/geometric/distance.inc | 23 +++++++++++++++++++++++
> >  generic/lib/SOURCES                        |  1 +
> >  generic/lib/geometric/distance.cl          | 30
> > ++++++++++++++++++++++++++++++
> >  generic/lib/geometric/distance.inc         | 25 +++++++++++++++++++++++++
> >  6 files changed, 102 insertions(+)
> >  create mode 100644 generic/include/clc/geometric/distance.inc
> >  create mode 100644 generic/lib/geometric/distance.cl
> >  create mode 100644 generic/lib/geometric/distance.inc
> >
> > diff --git a/generic/include/clc/clc.h b/generic/include/clc/clc.h
> > index cee1614..2fb818a 100644
> > --- a/generic/include/clc/clc.h
> > +++ b/generic/include/clc/clc.h
> > @@ -114,6 +114,7 @@
> >
> >  /* 6.11.5 Geometric Functions */
> >  #include <clc/geometric/cross.h>
> > +#include <clc/geometric/distance.h>
> >  #include <clc/geometric/dot.h>
> >  #include <clc/geometric/length.h>
> >  #include <clc/geometric/normalize.h>
> > diff --git a/generic/include/clc/geometric/distance.h
> > b/generic/include/clc/geometric/distance.h
> > index 3e91332..c7aa6a1 100644
> > --- a/generic/include/clc/geometric/distance.h
> > +++ b/generic/include/clc/geometric/distance.h
> > @@ -1,2 +1,24 @@
> > +/*
> > + * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining
> > a copy
> > + * of this software and associated documentation files (the "Software"),
> > to deal
> > + * in the Software without restriction, including without limitation the
> > rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
> > sell
> > + * copies of the Software, and to permit persons to whom the Software is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
> > included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> > SHALL THE
> > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN
> > + * THE SOFTWARE.
> > + */
> > +
> >
> 
> This patch looks good to me.
> 
> I don't see much point in retroactively adding the AMD copyright statement
> to distance.h since you're not modifying the file itself at this time (and
> Peter was the initial author), but while it seems weird, you are also
> included in the commit history for the file (adding __CLC_ prefix to the
> macro names).... so I guess it's not completely out of line.
> 

Thanks for catching this.  It was an oversight on my part, I will drop
this part of the commit.

-Tom

> But that being said, the functionality and code looks exactly like what I
> had written myself independently (other than chosen variable names).
> 
> --Aaron
> 
> 
> >  #define __CLC_BODY <clc/geometric/distance.inc>
> >  #include <clc/geometric/floatn.inc>
> > diff --git a/generic/include/clc/geometric/distance.inc
> > b/generic/include/clc/geometric/distance.inc
> > new file mode 100644
> > index 0000000..6babbdc
> > --- /dev/null
> > +++ b/generic/include/clc/geometric/distance.inc
> > @@ -0,0 +1,23 @@
> > +/*
> > + * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining
> > a copy
> > + * of this software and associated documentation files (the "Software"),
> > to deal
> > + * in the Software without restriction, including without limitation the
> > rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
> > sell
> > + * copies of the Software, and to permit persons to whom the Software is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
> > included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> > SHALL THE
> > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN
> > + * THE SOFTWARE.
> > + */
> > +
> > +_CLC_OVERLOAD _CLC_DECL __CLC_FLOAT distance(__CLC_FLOATN p0,
> > __CLC_FLOATN p1);
> > diff --git a/generic/lib/SOURCES b/generic/lib/SOURCES
> > index ac3d870..9ac2c05 100644
> > --- a/generic/lib/SOURCES
> > +++ b/generic/lib/SOURCES
> > @@ -33,6 +33,7 @@ common/sign.cl
> >  common/smoothstep.cl
> >  common/step.cl
> >  geometric/cross.cl
> > +geometric/distance.cl
> >  geometric/dot.cl
> >  geometric/length.cl
> >  geometric/normalize.cl
> > diff --git a/generic/lib/geometric/distance.cl b/generic/lib/geometric/
> > distance.cl
> > new file mode 100644
> > index 0000000..4a5b8e2
> > --- /dev/null
> > +++ b/generic/lib/geometric/distance.cl
> > @@ -0,0 +1,30 @@
> > +/*
> > + * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining
> > a copy
> > + * of this software and associated documentation files (the "Software"),
> > to deal
> > + * in the Software without restriction, including without limitation the
> > rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
> > sell
> > + * copies of the Software, and to permit persons to whom the Software is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
> > included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> > SHALL THE
> > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN
> > + * THE SOFTWARE.
> > + */
> > +
> > +#include <clc/clc.h>
> > +
> > +#ifdef cl_khr_fp64
> > +#pragma OPENCL EXTENSION cl_khr_fp64 : enable
> > +#endif
> > +
> > +#define __CLC_BODY <distance.inc>
> > +#include <clc/geometric/floatn.inc>
> > diff --git a/generic/lib/geometric/distance.inc
> > b/generic/lib/geometric/distance.inc
> > new file mode 100644
> > index 0000000..193665e
> > --- /dev/null
> > +++ b/generic/lib/geometric/distance.inc
> > @@ -0,0 +1,25 @@
> > +/*
> > + * Copyright (c) 2014,2015 Advanced Micro Devices, Inc.
> > + *
> > + * Permission is hereby granted, free of charge, to any person obtaining
> > a copy
> > + * of this software and associated documentation files (the "Software"),
> > to deal
> > + * in the Software without restriction, including without limitation the
> > rights
> > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or
> > sell
> > + * copies of the Software, and to permit persons to whom the Software is
> > + * furnished to do so, subject to the following conditions:
> > + *
> > + * The above copyright notice and this permission notice shall be
> > included in
> > + * all copies or substantial portions of the Software.
> > + *
> > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> > EXPRESS OR
> > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> > MERCHANTABILITY,
> > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
> > SHALL THE
> > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
> > ARISING FROM,
> > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN
> > + * THE SOFTWARE.
> > + */
> > +
> > +_CLC_OVERLOAD _CLC_DEF __CLC_FLOAT distance(__CLC_FLOATN p0, __CLC_FLOATN
> > p1) {
> > +  return length(p0 - p1);
> > +}
> > --
> > 2.0.4
> >
> >
> > _______________________________________________
> > Libclc-dev mailing list
> > Libclc-dev at pcc.me.uk
> > http://www.pcc.me.uk/cgi-bin/mailman/listinfo/libclc-dev
> >

> _______________________________________________
> Libclc-dev mailing list
> Libclc-dev at pcc.me.uk
> http://www.pcc.me.uk/cgi-bin/mailman/listinfo/libclc-dev

More information about the Libclc-dev mailing list