- Compact free_memory. Check parallel variable type in Template. Gene…

…rate one more file for ParModelica.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@11636 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/susan_codegen/SimCode/CodegenC.tpl

@@ -77,6 +77,10 @@ case SIMCODE(modelInfo=modelInfo as MODELINFO(__)) then
   //        for the same model (i.e. see testsuite/linearize/simextfunction.mos).
   let()= textFile(simulationFile(simCode,guid), '<%fileNamePrefix%>.c')
 
+  // If ParModelica generate the kernels file too.
+  if acceptParModelicaGrammar() then
+    let()= textFile(parModelicaKernelsFile(fileNamePrefix, modelInfo.functions, literals), '<%fileNamePrefix%>_kernels.cl')
+
   //this top-level template always returns an empty result 
   //since generated texts are written to files directly
   ""
@@ -2053,6 +2057,20 @@ template simulationFunctionsFile(String filePrefix, list<Function> functions, li
   /* adpro: leave a newline at the end of file to get rid of warnings! */
 end simulationFunctionsFile;
 
+template parModelicaKernelsFile(String filePrefix, list<Function> functions, list<Exp> literals)
+ "Generates the content of the C file for functions in the simulation case."
+::=
+  <<
+  #include "<%filePrefix%>_functions.h"
+
+  <%literals |> literal hasindex i0 fromindex 0 => literalExpConst(literal,i0) ; separator="\n"%>
+  <%functionBodies(functions)%>
+
+
+  >>
+
+end parModelicaKernelsFile;
+
 template recordsFile(String filePrefix, list<RecordDeclaration> recordDecls)
  "Generates the content of the C file for functions in the simulation case."
 ::=
@@ -3408,7 +3426,7 @@ template parVarInit(Variable var, String outStruct, Integer i, Text &varDecls /*
   Does not return anything: just appends declarations to buffers."
 ::=
 match var
-case var as VARIABLE(__) then
+case var as VARIABLE(parallelism = PARGLOBAL(__)) then
   let varName = '<%contextCref(var.name,contextFunction)%>'
 
 
@@ -3422,16 +3440,16 @@ case var as VARIABLE(__) then
     let defaultValue = varDefaultValue(var, outStruct, i, varName, &varDecls, &varInits)
     let &varInits += defaultValue
 
-    let &varFrees += 'clReleaseMemObject(<%varName%>.data);<%\n%>'
-    let &varFrees += 'clReleaseMemObject(<%varName%>.info_dev);<%\n%>'
-    let &varFrees += 'free(<%varName%>.info);<%\n%>'    
+    let &varFrees += 'free_device_array(&<%varName%>);<%\n%>'    
     ""
   else
     let &varDecls += 'device_<%expTypeShort(var.ty)%> <%varName%>;<%\n%>'
     let &varInits += '<%varName%> = ocl_device_alloc(sizeof(modelica_<%expTypeShort(var.ty)%>));<%\n%>'
     let &varFrees += 'clReleaseMemObject(<%varName%>);<%\n%>'
     ""
-
+case var as VARIABLE(parallelism = PARLOCAL(__)) then 
+  let &varDecls += '#PARLOCAL variable type should not be allowed here. FIXME!!<%\n%>' ""
+
 else let &varDecls += '#error Unknown parallel variable type<%\n%>' ""
 end parVarInit;
 

ParModelica/OpenCLRuntime/omc_ocl_interface.c

@@ -136,7 +136,7 @@ void alloc_integer_array(device_integer_array *dest, int ndims, ...){
 }
 
 //entry point for allocating real array on device
-void alloc_real_array(device_integer_array *dest, int ndims, ...){
+void alloc_real_array(device_real_array *dest, int ndims, ...){
 
     size_t elements = 0;
     va_list ap;
@@ -150,7 +150,11 @@ void alloc_real_array(device_integer_array *dest, int ndims, ...){
 }
 
 
-
+void free_device_array(device_array *dest){
+    clReleaseMemObject(dest->data);
+    clReleaseMemObject(dest->info_dev);
+    free(dest->info);
+}
 
 
 void copy_real_array_data(device_real_array* dev_array_ptr, real_array_t* host_array_ptr){

ParModelica/OpenCLRuntime/omc_ocl_interface.h

@@ -134,6 +134,9 @@ modelica_integer size_of_dimension_real_array(device_real_array dev_arr, modelic
 //array dimension size functions. returns the size of a given dimension for device integer array
 modelica_integer size_of_dimension_integer_array(device_integer_array dev_arr, modelica_integer dim);
 
+//Free a device array memory.
+void free_device_array(device_array *dest);
+
 
 //prints information about a device array. useful for debugging.
 void print_array_info(device_real_array* arr);

ParModelica/OpenCLRuntime/omc_ocl_memory_ops.c

@@ -51,7 +51,11 @@
 cl_mem ocl_device_alloc(size_t size){
 
     cl_int err;
-    cl_mem tmp;
+    cl_mem tmp = NULL;
+
+    if (!device_comm_queue)
+        ocl_initialize();
+
     tmp = clCreateBuffer(device_context, CL_MEM_READ_WRITE,
             size, NULL, &err);
 
@@ -63,6 +67,10 @@ cl_mem ocl_device_alloc_init(modelica_integer* host_array, size_t size){
 
     cl_int err;
     cl_mem tmp = NULL;
+
+    if (!device_comm_queue)
+        ocl_initialize();
+
     if (host_array)
         tmp = clCreateBuffer(device_context, CL_MEM_READ_WRITE |
             CL_MEM_COPY_HOST_PTR, size, host_array, &err);
@@ -77,6 +85,10 @@ cl_mem ocl_device_alloc_init(modelica_real* host_array, size_t size){
 
     cl_int err;
     cl_mem tmp = NULL;
+
+    if (!device_comm_queue)
+        ocl_initialize();
+
     if (host_array)
         tmp = clCreateBuffer(device_context, CL_MEM_READ_WRITE |
             CL_MEM_COPY_HOST_PTR, size, host_array, &err);
@@ -90,7 +102,8 @@ cl_mem ocl_device_alloc_init(modelica_real* host_array, size_t size){
 
 cl_mem ocl_alloc_init(void* src_data, size_t size){
     cl_int err;
-    cl_mem tmp;
+    cl_mem tmp = NULL;
+
     if (!device_comm_queue)
         ocl_initialize();