mirror of
				https://github.com/paboyle/Grid.git
				synced 2025-10-31 12:04:33 +00:00 
			
		
		
		
	Where working
This commit is contained in:
		| @@ -43,17 +43,16 @@ NAMESPACE_BEGIN(Grid); | ||||
| // Predicated where support | ||||
| //////////////////////////////////////////////////// | ||||
| #ifdef GRID_SIMT | ||||
| // drop to scalar in SIMT; cleaner in fact | ||||
| template <class iobj, class vobj, class robj> | ||||
| accelerator_inline vobj predicatedWhere(const iobj &predicate,  | ||||
| 					const vobj &iftrue,  | ||||
| 					const robj &iffalse)  | ||||
| { | ||||
|   // should drop to sccalar in SIMT | ||||
|   //  typename std::remove_const<vobj>::type ret; | ||||
|   //  Integer mask = TensorRemove(predicate); | ||||
|   //  ret = iffalse; | ||||
|   //  if (TensorRemove(mask)) ret=iftrue; | ||||
|   return iftrue; | ||||
|   Integer mask = TensorRemove(predicate); | ||||
|   typename std::remove_const<vobj>::type ret= iffalse; | ||||
|   if (mask) ret=iftrue; | ||||
|   return ret; | ||||
| } | ||||
| #else | ||||
| template <class iobj, class vobj, class robj> | ||||
| @@ -98,65 +97,62 @@ struct getVectorType<Lattice<T> >{ | ||||
| //--  recursive evaluation of expressions; -- | ||||
| // handle leaves of syntax tree | ||||
| /////////////////////////////////////////////////// | ||||
| template<class sobj> accelerator_inline  | ||||
| template<class sobj, | ||||
|   typename std::enable_if<!is_lattice<sobj>::value&&!is_lattice_expr<sobj>::value,sobj>::type * = nullptr>  | ||||
| accelerator_inline  | ||||
| sobj eval(const uint64_t ss, const sobj &arg) | ||||
| { | ||||
|   return arg; | ||||
| } | ||||
| template <class lobj> accelerator_inline  | ||||
| const lobj & eval(const uint64_t ss, const LatticeView<lobj> &arg)  | ||||
| auto eval(const uint64_t ss, const LatticeView<lobj> &arg) -> decltype(arg(ss)) | ||||
| { | ||||
|   return arg[ss]; | ||||
|   return arg(ss); | ||||
| } | ||||
|  | ||||
| template<class sobj, | ||||
|   typename std::enable_if<!is_lattice<sobj>::value&&!is_lattice_expr<sobj>::value,sobj>::type * = nullptr>  | ||||
| accelerator_inline  | ||||
| sobj coalescedEval(const uint64_t ss, const sobj &arg) | ||||
| //////////////////////////////////////////// | ||||
| //--  recursive evaluation of expressions; -- | ||||
| // whole vector return, used only for expression return type inference | ||||
| /////////////////////////////////////////////////// | ||||
| template<class sobj> accelerator_inline  | ||||
| sobj vecEval(const uint64_t ss, const sobj &arg) | ||||
| { | ||||
|   return arg; | ||||
| } | ||||
| #ifdef GRID_SIMT | ||||
| #warning device | ||||
| template <class lobj> accelerator_inline  | ||||
| typename lobj::scalar_object coalescedEval(const uint64_t ss, const LatticeView<lobj> &arg)  | ||||
| const lobj & vecEval(const uint64_t ss, const LatticeView<lobj> &arg)  | ||||
| { | ||||
|   auto ret = arg(ss); | ||||
|   return ret; | ||||
| } | ||||
| #else | ||||
| #warning host | ||||
| template <class lobj> accelerator_inline  | ||||
| lobj coalescedEval(const uint64_t ss, const LatticeView<lobj> &arg)  | ||||
| { | ||||
|   //   return coalescedRead(arg[ss]); | ||||
|   return arg[ss]; | ||||
| } | ||||
| #endif | ||||
| /* | ||||
| template <class lobj> accelerator_inline  | ||||
| typename lobj::scalar_type coalescedEval(const uint64_t ss, const Lattice<lobj> &arg)  | ||||
| { | ||||
|   assert(0); | ||||
|   return coalescedRead(arg[ss]); | ||||
| } | ||||
| */ | ||||
|  | ||||
| // What needs this? | ||||
| // Cannot be legal on accelerator | ||||
| // Comparison must convert | ||||
| #if 1 | ||||
| template <class lobj> accelerator_inline  | ||||
| const lobj & eval(const uint64_t ss, const Lattice<lobj> &arg)  | ||||
| { | ||||
|   assert(0); | ||||
|   auto view = arg.View(AcceleratorRead); | ||||
|   return view[ss]; | ||||
| } | ||||
| #endif | ||||
|  | ||||
| /////////////////////////////////////////////////// | ||||
| // handle nodes in syntax tree- eval one operand | ||||
| // vecEval needed (but never called as all expressions offloaded) to infer the return type | ||||
| // in SIMT contexts of closure. | ||||
| /////////////////////////////////////////////////// | ||||
| template <typename Op, typename T1> accelerator_inline  | ||||
| auto vecEval(const uint64_t ss, const LatticeUnaryExpression<Op, T1> &expr)   | ||||
|   -> decltype(expr.op.func( vecEval(ss, expr.arg1))) | ||||
| { | ||||
|   return expr.op.func( vecEval(ss, expr.arg1) ); | ||||
| } | ||||
| // vecEval two operands | ||||
| template <typename Op, typename T1, typename T2> accelerator_inline | ||||
| auto vecEval(const uint64_t ss, const LatticeBinaryExpression<Op, T1, T2> &expr)   | ||||
|   -> decltype(expr.op.func( vecEval(ss,expr.arg1),vecEval(ss,expr.arg2))) | ||||
| { | ||||
|   return expr.op.func( vecEval(ss,expr.arg1), vecEval(ss,expr.arg2) ); | ||||
| } | ||||
| // vecEval three operands | ||||
| template <typename Op, typename T1, typename T2, typename T3> accelerator_inline | ||||
| auto vecEval(const uint64_t ss, const LatticeTrinaryExpression<Op, T1, T2, T3> &expr)   | ||||
|   -> decltype(expr.op.func(vecEval(ss, expr.arg1), vecEval(ss, expr.arg2), vecEval(ss, expr.arg3))) | ||||
| { | ||||
|   return expr.op.func(vecEval(ss, expr.arg1), vecEval(ss, expr.arg2), vecEval(ss, expr.arg3)); | ||||
| } | ||||
|  | ||||
| /////////////////////////////////////////////////// | ||||
| // handle nodes in syntax tree- eval one operand coalesced | ||||
| /////////////////////////////////////////////////// | ||||
| template <typename Op, typename T1> accelerator_inline  | ||||
| auto eval(const uint64_t ss, const LatticeUnaryExpression<Op, T1> &expr)   | ||||
| @@ -174,37 +170,31 @@ auto eval(const uint64_t ss, const LatticeBinaryExpression<Op, T1, T2> &expr) | ||||
| // eval three operands | ||||
| template <typename Op, typename T1, typename T2, typename T3> accelerator_inline | ||||
| auto eval(const uint64_t ss, const LatticeTrinaryExpression<Op, T1, T2, T3> &expr)   | ||||
|   -> decltype(expr.op.func(eval(ss, expr.arg1), eval(ss, expr.arg2), eval(ss, expr.arg3))) | ||||
|   -> decltype(expr.op.func(eval(ss, expr.arg1),  | ||||
| 			   eval(ss, expr.arg2),  | ||||
| 			   eval(ss, expr.arg3))) | ||||
| { | ||||
|   return expr.op.func(eval(ss, expr.arg1), eval(ss, expr.arg2), eval(ss, expr.arg3)); | ||||
| } | ||||
| #ifdef GRID_SIMT | ||||
|   // Handles Nsimd (vInteger) != Nsimd(ComplexD) | ||||
|   typedef decltype(vecEval(ss, expr.arg2)) rvobj; | ||||
|   typedef typename std::remove_reference<rvobj>::type vobj; | ||||
|  | ||||
| /////////////////////////////////////////////////// | ||||
| // handle nodes in syntax tree- eval one operand coalesced | ||||
| /////////////////////////////////////////////////// | ||||
| template <typename Op, typename T1> accelerator_inline  | ||||
| auto coalescedEval(const uint64_t ss, const LatticeUnaryExpression<Op, T1> &expr)   | ||||
|   -> decltype(expr.op.func( coalescedEval(ss, expr.arg1))) | ||||
| { | ||||
|   return expr.op.func( coalescedEval(ss, expr.arg1) ); | ||||
| } | ||||
| // eval two operands | ||||
| template <typename Op, typename T1, typename T2> accelerator_inline | ||||
| auto coalescedEval(const uint64_t ss, const LatticeBinaryExpression<Op, T1, T2> &expr)   | ||||
|   -> decltype(expr.op.func( coalescedEval(ss,expr.arg1),coalescedEval(ss,expr.arg2))) | ||||
| { | ||||
|   return expr.op.func( coalescedEval(ss,expr.arg1), coalescedEval(ss,expr.arg2) ); | ||||
| } | ||||
| // eval three operands | ||||
| template <typename Op, typename T1, typename T2, typename T3> accelerator_inline | ||||
| auto coalescedEval(const uint64_t ss, const LatticeTrinaryExpression<Op, T1, T2, T3> &expr)   | ||||
|   -> decltype(expr.op.func(coalescedEval(ss, expr.arg1),  | ||||
| 			   coalescedEval(ss, expr.arg2),  | ||||
| 			   coalescedEval(ss, expr.arg3))) | ||||
| { | ||||
|   return expr.op.func(coalescedEval(ss, expr.arg1),  | ||||
| 		      coalescedEval(ss, expr.arg2),  | ||||
| 		      coalescedEval(ss, expr.arg3)); | ||||
|   const int Nsimd = vobj::vector_type::Nsimd(); | ||||
|  | ||||
|   auto vpred = vecEval(ss,expr.arg1); | ||||
|  | ||||
|   ExtractBuffer<Integer> mask(Nsimd); | ||||
|   extract<vInteger, Integer>(TensorRemove(vpred), mask); | ||||
|  | ||||
|   int s = acceleratorSIMTlane(Nsimd); | ||||
|   return expr.op.func(mask[s], | ||||
| 		      eval(ss, expr.arg2),  | ||||
| 		      eval(ss, expr.arg3)); | ||||
| #else | ||||
|   return expr.op.func(eval(ss, expr.arg1), | ||||
| 		      eval(ss, expr.arg2),  | ||||
| 		      eval(ss, expr.arg3)); | ||||
| #endif | ||||
| } | ||||
|  | ||||
| ////////////////////////////////////////////////////////////////////////// | ||||
| @@ -302,7 +292,7 @@ template <typename Op, typename T1, typename T2> inline | ||||
| void ExpressionViewOpen(LatticeBinaryExpression<Op, T1, T2> &expr)  | ||||
| { | ||||
|   ExpressionViewOpen(expr.arg1);  // recurse AST | ||||
|   ExpressionViewOpen(expr.arg2);  // recurse AST | ||||
|   ExpressionViewOpen(expr.arg2);  // rrecurse AST | ||||
| } | ||||
| template <typename Op, typename T1, typename T2, typename T3> | ||||
| inline void ExpressionViewOpen(LatticeTrinaryExpression<Op, T1, T2, T3> &expr)  | ||||
| @@ -346,7 +336,6 @@ inline void ExpressionViewClose(LatticeTrinaryExpression<Op, T1, T2, T3> &expr) | ||||
| // Unary operators and funcs | ||||
| //////////////////////////////////////////// | ||||
| #define GridUnopClass(name, ret)					\ | ||||
|   template <class arg>							\ | ||||
|   struct name {								\ | ||||
|     template<class _arg> static auto accelerator_inline func(const _arg a) -> decltype(ret) { return ret; } \ | ||||
|   }; | ||||
| @@ -359,8 +348,6 @@ GridUnopClass(UnaryTrace, trace(a)); | ||||
| GridUnopClass(UnaryTranspose, transpose(a)); | ||||
| GridUnopClass(UnaryTa, Ta(a)); | ||||
| GridUnopClass(UnaryProjectOnGroup, ProjectOnGroup(a)); | ||||
| GridUnopClass(UnaryReal, real(a)); | ||||
| GridUnopClass(UnaryImag, imag(a)); | ||||
| GridUnopClass(UnaryToReal, toReal(a)); | ||||
| GridUnopClass(UnaryToComplex, toComplex(a)); | ||||
| GridUnopClass(UnaryTimesI, timesI(a)); | ||||
| @@ -379,7 +366,6 @@ GridUnopClass(UnaryExp, exp(a)); | ||||
| // Binary operators | ||||
| //////////////////////////////////////////// | ||||
| #define GridBinOpClass(name, combination)			\ | ||||
|   template <class left, class right>				\ | ||||
|   struct name {							\ | ||||
|     template <class _left, class _right>			\ | ||||
|     static auto accelerator_inline				\ | ||||
| @@ -403,7 +389,6 @@ GridBinOpClass(BinaryOrOr, lhs || rhs); | ||||
| // Trinary conditional op | ||||
| //////////////////////////////////////////////////// | ||||
| #define GridTrinOpClass(name, combination)				\ | ||||
|   template <class predicate, class left, class right>			\ | ||||
|   struct name {								\ | ||||
|     template <class _predicate,class _left, class _right>		\ | ||||
|     static auto accelerator_inline					\ | ||||
| @@ -423,10 +408,9 @@ GridTrinOpClass(TrinaryWhere, | ||||
| //////////////////////////////////////////// | ||||
| // Operator syntactical glue | ||||
| //////////////////////////////////////////// | ||||
|  | ||||
| #define GRID_UNOP(name)   name<decltype(eval(0, arg))> | ||||
| #define GRID_BINOP(name)  name<decltype(eval(0, lhs)), decltype(eval(0, rhs))> | ||||
| #define GRID_TRINOP(name) name<decltype(eval(0, pred)), decltype(eval(0, lhs)), decltype(eval(0, rhs))> | ||||
| #define GRID_UNOP(name)   name | ||||
| #define GRID_BINOP(name)  name | ||||
| #define GRID_TRINOP(name) name | ||||
|  | ||||
| #define GRID_DEF_UNOP(op, name)						\ | ||||
|   template <typename T1, typename std::enable_if<is_lattice<T1>::value||is_lattice_expr<T1>::value,T1>::type * = nullptr> \ | ||||
| @@ -478,8 +462,6 @@ GRID_DEF_UNOP(trace, UnaryTrace); | ||||
| GRID_DEF_UNOP(transpose, UnaryTranspose); | ||||
| GRID_DEF_UNOP(Ta, UnaryTa); | ||||
| GRID_DEF_UNOP(ProjectOnGroup, UnaryProjectOnGroup); | ||||
| GRID_DEF_UNOP(real, UnaryReal); | ||||
| GRID_DEF_UNOP(imag, UnaryImag); | ||||
| GRID_DEF_UNOP(toReal, UnaryToReal); | ||||
| GRID_DEF_UNOP(toComplex, UnaryToComplex); | ||||
| GRID_DEF_UNOP(timesI, UnaryTimesI); | ||||
| @@ -512,29 +494,36 @@ GRID_DEF_TRINOP(where, TrinaryWhere); | ||||
| ///////////////////////////////////////////////////////////// | ||||
| template <class Op, class T1> | ||||
| auto closure(const LatticeUnaryExpression<Op, T1> &expr) | ||||
|   -> Lattice<decltype(expr.op.func(eval(0, expr.arg1)))>  | ||||
|   -> Lattice<decltype(expr.op.func(vecEval(0, expr.arg1)))>  | ||||
| { | ||||
|   Lattice<decltype(expr.op.func(eval(0, expr.arg1)))> ret(expr); | ||||
|   Lattice<decltype(expr.op.func(vecEval(0, expr.arg1)))> ret(expr); | ||||
|   return ret; | ||||
| } | ||||
| template <class Op, class T1, class T2> | ||||
| auto closure(const LatticeBinaryExpression<Op, T1, T2> &expr) | ||||
|   -> Lattice<decltype(expr.op.func(eval(0, expr.arg1),eval(0, expr.arg2)))>  | ||||
|   -> Lattice<decltype(expr.op.func(vecEval(0, expr.arg1),vecEval(0, expr.arg2)))>  | ||||
| { | ||||
|   Lattice<decltype(expr.op.func(eval(0, expr.arg1),eval(0, expr.arg2)))> ret(expr); | ||||
|   Lattice<decltype(expr.op.func(vecEval(0, expr.arg1),vecEval(0, expr.arg2)))> ret(expr); | ||||
|   return ret; | ||||
| } | ||||
| template <class Op, class T1, class T2, class T3> | ||||
| auto closure(const LatticeTrinaryExpression<Op, T1, T2, T3> &expr) | ||||
|   -> Lattice<decltype(expr.op.func(eval(0, expr.arg1), | ||||
| 				   eval(0, expr.arg2), | ||||
| 				   eval(0, expr.arg3)))>  | ||||
|   -> Lattice<decltype(expr.op.func(vecEval(0, expr.arg1), | ||||
| 				   vecEval(0, expr.arg2), | ||||
| 				   vecEval(0, expr.arg3)))>  | ||||
| { | ||||
|   Lattice<decltype(expr.op.func(eval(0, expr.arg1), | ||||
| 				eval(0, expr.arg2), | ||||
| 				eval(0, expr.arg3)))>  ret(expr); | ||||
|   Lattice<decltype(expr.op.func(vecEval(0, expr.arg1), | ||||
| 				vecEval(0, expr.arg2), | ||||
| 			        vecEval(0, expr.arg3)))>  ret(expr); | ||||
|   return ret; | ||||
| } | ||||
| #define EXPRESSION_CLOSURE(function)					\ | ||||
|   template<class Expression,typename std::enable_if<is_lattice_expr<Expression>::value,void>::type * = nullptr> \ | ||||
|     auto function(Expression &expr) -> decltype(function(closure(expr))) \ | ||||
|   {									\ | ||||
|     return function(closure(expr));					\ | ||||
|   } | ||||
|  | ||||
|  | ||||
| #undef GRID_UNOP | ||||
| #undef GRID_BINOP | ||||
|   | ||||
		Reference in New Issue
	
	Block a user