Merge pull request YaccConstructor#129 from dpanfilyonok/fixes

Fixes + Support of using DU inside kernels
dpanfilyonok · Jan 3, 2022 · 88be551 · 88be551
2 parents 02502db + e3b4690
commit 88be551
Show file tree

Hide file tree

Showing 42 changed files with 2,111 additions and 1,846 deletions.
diff --git a/src/Brahma.FSharp.OpenCL.AST/Expressions.fs b/src/Brahma.FSharp.OpenCL.AST/Expressions.fs
@@ -66,6 +66,7 @@ type BOp<'lang> =
     | Pow
     | BitAnd
     | BitOr
+    | BitXor
     | LeftShift
     | RightShift
     | And
@@ -91,6 +92,7 @@ type UOp<'lang> =
     | Not
     | Incr
     | Decr
+    | BitNegation
 
 type Unop<'lang>(op: UOp<'lang>, expr: Expression<'lang>) =
     inherit Expression<'lang>()

diff --git a/src/Brahma.FSharp.OpenCL.AST/Statements.fs b/src/Brahma.FSharp.OpenCL.AST/Statements.fs
@@ -77,7 +77,7 @@ type ForIntegerLoop<'lang>
     (
         var: VarDecl<'lang>,
         cond: Expression<'lang>,
-        countModifier: Expression<'lang>,
+        countModifier: Statement<'lang>,
         body: StatementBlock<'lang>
     ) =
 
@@ -94,9 +94,15 @@ type WhileLoop<'lang>(cond: Expression<'lang>, whileBlock: StatementBlock<'lang>
     member this.Condition = cond
     member this.WhileBlock = whileBlock
 
-type Barrier<'lang>() =
+type MemFence =
+    | Local
+    | Global
+    | Both
+
+type Barrier<'lang>(memFence: MemFence) =
     inherit Statement<'lang>()
     override this.Children = []
+    member this.MemFence = memFence
 
 type FieldSet<'lang>(host: Expression<'lang>, field: string, _val: Expression<'lang>) =
     inherit Statement<'lang>()

diff --git a/src/Brahma.FSharp.OpenCL.Core/Brahma.FSharp.OpenCL.Core.fsproj b/src/Brahma.FSharp.OpenCL.Core/Brahma.FSharp.OpenCL.Core.fsproj
@@ -20,14 +20,14 @@
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="ClException.fs" />
-    <Compile Include="NDRangeDimensions.fs" />
+    <Compile Include="NDRange.fs" />
     <Compile Include="CustomMarshaler.fs" />
     <Compile Include="IKernel.fs" />
     <Compile Include="Messages.fs" />
     <Compile Include="CommandQueueProvider.fs" />
     <Compile Include="IContext.fs" />
     <Compile Include="ClBuffer.fs" />
-    <Compile Include="ClKernel.fs" />
+    <Compile Include="ClProgram.fs" />
     <Compile Include="ClContext.fs" />
     <Compile Include="ClTask.fs" />
     <Compile Include="DataStructures.fs" />
@@ -39,4 +39,4 @@
     <ProjectReference Include="..\Brahma.FSharp.OpenCL.Shared\Brahma.FSharp.OpenCL.Shared.fsproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>
+</Project>
diff --git a/src/Brahma.FSharp.OpenCL.Core/ClContext.fs b/src/Brahma.FSharp.OpenCL.Core/ClContext.fs
@@ -35,6 +35,7 @@ type ClDeviceType =
         | GPU -> DeviceType.Gpu
         | Default -> DeviceType.Default
 
+// TODO redesign
 module internal Device =
     open System.Text.RegularExpressions
 
@@ -82,7 +83,7 @@ type ClContext private (context: Context, device: Device, translator: FSQuotatio
 
             ctx
 
-        let translator = FSQuotationToOpenCLTranslator()
+        let translator = FSQuotationToOpenCLTranslator(TranslatorOptions())
         let queue = CommandQueueProvider.CreateQueue(context, device)
 
         ClContext(context, device, translator, queue)
@@ -101,7 +102,7 @@ type ClContext private (context: Context, device: Device, translator: FSQuotatio
     member this.WithNewCommandQueue() =
         ClContext(this.Context, this.Device, this.Translator, CommandQueueProvider.CreateQueue(this.Context, this.Device))
 
-    member this.CreateClKernel(srcLambda: Expr<'a -> 'b>) =
+    member this.CreateClProgram(srcLambda: Expr<'a -> 'b>) =
         ClProgram<_,_>(this, srcLambda)
 
     member this.CreateClBuffer

diff --git a/src/Brahma.FSharp.OpenCL.Core/ClKernel.fs b/src/Brahma.FSharp.OpenCL.Core/ClKernel.fs