Changeset 736 for soft/giet_vm/applications/coproc/coproc.c

Timestamp:

Dec 3, 2015, 4:40:49 PM (9 years ago)

Author:

alain

Message:

Modify the mjpeg application to support an optional
DCT hardware coprocessor.

File:

• soft/giet_vm/applications/coproc/coproc.c (modified) (7 diffs)

soft/giet_vm/applications/coproc/coproc.c

@@ -1 @@
-///////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
 //  file   : coproc.c
 //  date   : avril 2015
 //  author : Alain Greiner
-///////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
 //  This file describes the single thread "coproc" application.
 //  It uses the GCD (Greater Common Divider) hardware coprocessor
 //  to make the GCD computation between two vectors of 32 bits integers.
+//  It supports two coprocessor operating modes: MODE_DMA_IRQ or MODE_DMA_NO_IRQ. 
 //  The vectors size is defined by the VECTOR_SIZE parameter.
-///////////////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////////////
 
 
@@ -41 +42 @@
                     x, y, lpid, giet_proctime() );
 
+    // check coprocessor operating mode
+    giet_pthread_assert( (DMA_MODE == MODE_DMA_IRQ) || (DMA_MODE == MODE_DMA_NO_IRQ),
+    "\n[COPROC ERROR] only MODE_DMA_IRQ and MODE_DMA_NO_IRQ modes are supported");
+
     // initializes opa & opb buffers
     unsigned int word;
@@ -50 +55 @@
 
     unsigned int coproc_info;
+    unsigned int cluster_xy  = (x << 4) + y;
+    unsigned int coproc_type = MWR_SUBTYPE_GCD;
 
-    /////////////////////// request a GCD coprocessor
-    giet_coproc_alloc( MWR_SUBTYPE_GCD, &coproc_info );
+    // get a GCD coprocessor in local cluster
+    giet_coproc_alloc( cluster_xy,
+                       coproc_type,
+                       &coproc_info );
 
     // check coprocessor ports
@@ -69 +78 @@
 #endif
 
-    //////////////////////// initializes channel for OPA
+    // initializes OPA channel
     giet_coproc_channel_t opa_desc;
     opa_desc.channel_mode = DMA_MODE;
     opa_desc.buffer_size  = VECTOR_SIZE<<2;
     opa_desc.buffer_vaddr = (unsigned int)opa;
-    giet_coproc_channel_init( 0 , &opa_desc );
+    giet_coproc_channel_init( cluster_xy,
+                              coproc_type,
+                              0, 
+                              &opa_desc );
     
-    //////////////////////// initializes channel for OPB
+    // initializes OPB channel
     giet_coproc_channel_t opb_desc;
     opb_desc.channel_mode = DMA_MODE;
     opb_desc.buffer_size  = VECTOR_SIZE<<2;
     opb_desc.buffer_vaddr = (unsigned int)opb;
-    giet_coproc_channel_init( 1 , &opb_desc );
+    giet_coproc_channel_init( cluster_xy,
+                              coproc_type,
+                              1, 
+                              &opb_desc );
     
-    //////////////////////// initializes channel for RES
+    // initializes RES channel
     giet_coproc_channel_t res_desc;
     res_desc.channel_mode = DMA_MODE;
     res_desc.buffer_size  = VECTOR_SIZE<<2;
     res_desc.buffer_vaddr = (unsigned int)res;
-    giet_coproc_channel_init( 2 , &res_desc );
+    giet_coproc_channel_init( cluster_xy,
+                              coproc_type,
+                              2, 
+                              &res_desc );
     
 #if  VERBOSE
@@ -94 +112 @@
 #endif
 
-    /////////////////////// starts communication channels
-    giet_coproc_run( 0 );
+    // starts coprocessor
+    giet_coproc_run( cluster_xy,
+                     coproc_type );
 
 #if  VERBOSE
@@ -101 +120 @@
 #endif
 
-    /////////////////////// wait coprocessor completion
+    // wait coprocessor completion
     if ( DMA_MODE == MODE_DMA_NO_IRQ )
     {
-        giet_coproc_completed( );
+        giet_coproc_completed( cluster_xy,
+                               coproc_type );
     }
 
@@ -118 +138 @@
     }
 
-    ////////////////////// release GCD coprocessor
-    giet_coproc_release( 0 );
+    // release GCD coprocessor
+    giet_coproc_release( cluster_xy,
+                         coproc_type );
 
     giet_pthread_exit("completed");