Merge branch 'main' of github.com:microsoft/dpdpu into main

microsoft · Dec 23, 2023 · 1abaaf0 · 1abaaf0
2 parents fba12bd + 31b777d
commit 1abaaf0
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 47 deletions.
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadFunc.c b/DPDPU/OffloadEngine/UDFSamples/OffloadFunc.c
@@ -2,34 +2,22 @@
 #include "OffloadTypes.h"
 #include <stdio.h>
 
+struct MessageHeader {
+    long long TimeSend;
+    uint16_t BatchId;
+    uint16_t FileId;
+    uint64_t Offset;
+    int Length;
+};
+
 void OffloadFunc(
     void* Msg,
     RequestDescriptorT* Req,
     CacheTableT* CacheTable,
     OffloadWorkRequest* ReadOp
 ) {
-    // Msg is basically one packet, descriptor's offset and bytes point to the data we are interested in
-    //printf("offload func got msg: %s, offset: %hu, bytes: %hu\n", Msg, Req->Offset, Req->Bytes);
-    // ReadOp->RequestId = ??; // it's already assigned when we got it, don't touch
-    printf("request id: %u\n", ReadOp->RequestId);
-    ReadOp->FileId = 0; // always 0th file
-    ReadOp->Bytes = 8192;
-    ReadOp->Offset = 8192;
-    /*CacheItemT Item = {.Key = ReadOp->RequestId, .Version = 0, .FileId = 0, .Offset = 0, .Size = 8192};
-    int ret = AddToCacheTable(&Item);
-    CacheItemT* GotItem = LookUpCacheTable(&ReadOp->RequestId);
-    if (GotItem == NULL) {
-        printf("LookUpCacheTable returned NULL!!!\n");
-        return;
-    }
-    printf("Got item back, key %u, offset %u, size %u\n", GotItem->Key, GotItem->Offset, GotItem->Size);
-    // GotItem = NULL;
-    DeleteFromCacheTable(&ReadOp->RequestId);
-    GotItem = LookUpCacheTable(&ReadOp->RequestId);
-    if (GotItem != NULL) {
-        printf("LookUpCacheTable returned non NULL after delete!!!\n");
-        return;
-    }*/
-
-    //// once the read request is prepared it will eventually be completed and send the raw read content back to tcp client
+    struct MessageHeader* msg = (struct MessageHeader*)(((char*)Msg) + Req->Offset);
+    ReadOp->FileId = msg->FileId;
+    ReadOp->Bytes = msg->Length;
+    ReadOp->Offset = msg->Offset;
 }
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadFuncDisaggApp.c b/DPDPU/OffloadEngine/UDFSamples/OffloadFuncDisaggApp.c
@@ -0,0 +1,23 @@
+#include "CacheTable.h"
+#include "OffloadTypes.h"
+#include <stdio.h>
+
+struct MessageHeader {
+    long long TimeSend;
+    uint16_t BatchId;
+    uint16_t FileId;
+    uint64_t Offset;
+    int Length;
+};
+
+void OffloadFunc(
+    void* Msg,
+    RequestDescriptorT* Req,
+    CacheTableT* CacheTable,
+    OffloadWorkRequest* ReadOp
+) {
+    struct MessageHeader* msg = (struct MessageHeader*)(((char*)Msg) + Req->Offset);
+    ReadOp->FileId = msg->FileId;
+    ReadOp->Bytes = msg->Length;
+    ReadOp->Offset = msg->Offset;
+}
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadFuncExample.c b/DPDPU/OffloadEngine/UDFSamples/OffloadFuncExample.c
@@ -0,0 +1,35 @@
+#include "CacheTable.h"
+#include "OffloadTypes.h"
+#include <stdio.h>
+
+void OffloadFunc(
+    void* Msg,
+    RequestDescriptorT* Req,
+    CacheTableT* CacheTable,
+    OffloadWorkRequest* ReadOp
+) {
+    // Msg is basically one packet, descriptor's offset and bytes point to the data we are interested in
+    //printf("offload func got msg: %s, offset: %hu, bytes: %hu\n", Msg, Req->Offset, Req->Bytes);
+    // ReadOp->RequestId = ??; // it's already assigned when we got it, don't touch
+    printf("request id: %u\n", ReadOp->RequestId);
+    ReadOp->FileId = 0; // always 0th file
+    ReadOp->Bytes = 8192;
+    ReadOp->Offset = 8192;
+    /*CacheItemT Item = {.Key = ReadOp->RequestId, .Version = 0, .FileId = 0, .Offset = 0, .Size = 8192};
+    int ret = AddToCacheTable(&Item);
+    CacheItemT* GotItem = LookUpCacheTable(&ReadOp->RequestId);
+    if (GotItem == NULL) {
+        printf("LookUpCacheTable returned NULL!!!\n");
+        return;
+    }
+    printf("Got item back, key %u, offset %u, size %u\n", GotItem->Key, GotItem->Offset, GotItem->Size);
+    // GotItem = NULL;
+    DeleteFromCacheTable(&ReadOp->RequestId);
+    GotItem = LookUpCacheTable(&ReadOp->RequestId);
+    if (GotItem != NULL) {
+        printf("LookUpCacheTable returned non NULL after delete!!!\n");
+        return;
+    }*/
+
+    //// once the read request is prepared it will eventually be completed and send the raw read content back to tcp client
+}
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadPred.c b/DPDPU/OffloadEngine/UDFSamples/OffloadPred.c
@@ -2,11 +2,12 @@
 #include "OffloadTypes.h"
 #include <stdio.h>
 
-/* struct MessageHeader {
-    bool OffloadedToDPU;
-    bool LastMessage;
-    int MessageSize;
+struct MessageHeader {
     long long TimeSend;
+    uint16_t BatchId;
+    uint16_t FileId;
+    uint64_t Offset;
+    int Length;
 };
 
 void OffloadPred(
@@ -18,24 +19,14 @@ void OffloadPred(
     uint8_t* NumReqsForHost,
     uint8_t* NumReqsForDPU
 ) {
-    *NumReqsForHost = 1;
-    *NumReqsForDPU = 0;
-    ReqsForHost[0].Offset = 0;
-    ReqsForHost[0].Bytes = Bytes;
-} */
+    const uint16_t reqSize = sizeof(struct MessageHeader);
+    const int numReqsForDPU = Bytes / reqSize;
 
-void OffloadPred(
-    void* Msg,
-    uint16_t Bytes,
-    CacheTableT* CacheTable,
-    RequestDescriptorT* ReqsForHost,
-    RequestDescriptorT* ReqsForDPU,
-    uint8_t* NumReqsForHost,
-    uint8_t* NumReqsForDPU
-) {
     *NumReqsForHost = 0;
-    *NumReqsForDPU = 1;
-    ReqsForDPU[0].Offset = 0;
-    ReqsForDPU[0].Bytes = Bytes;
-    printf("offload pred got msg, bytes: %hu\n", Bytes);
-} 
+    *NumReqsForDPU = numReqsForDPU;
+
+    for (int i = 0; i != numReqsForDPU; i++) {
+        ReqsForDPU[i].Offset = i * reqSize;
+        ReqsForDPU[i].Bytes = reqSize;    
+    }
+}
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadPredDisaggApp.c b/DPDPU/OffloadEngine/UDFSamples/OffloadPredDisaggApp.c
@@ -0,0 +1,32 @@
+#include "CacheTable.h"
+#include "OffloadTypes.h"
+#include <stdio.h>
+
+struct MessageHeader {
+    long long TimeSend;
+    uint16_t BatchId;
+    uint16_t FileId;
+    uint64_t Offset;
+    int Length;
+};
+
+void OffloadPred(
+    void* Msg,
+    uint16_t Bytes,
+    CacheTableT* CacheTable,
+    RequestDescriptorT* ReqsForHost,
+    RequestDescriptorT* ReqsForDPU,
+    uint8_t* NumReqsForHost,
+    uint8_t* NumReqsForDPU
+) {
+    const uint16_t reqSize = sizeof(struct MessageHeader);
+    const int numReqsForDPU = Bytes / reqSize;
+
+    *NumReqsForHost = 0;
+    *NumReqsForDPU = numReqsForDPU;
+
+    for (int i = 0; i != numReqsForDPU; i++) {
+        ReqsForDPU[i].Offset = i * reqSize;
+        ReqsForDPU[i].Bytes = reqSize;    
+    }
+}
diff --git a/DPDPU/OffloadEngine/UDFSamples/OffloadPredExample.c b/DPDPU/OffloadEngine/UDFSamples/OffloadPredExample.c
@@ -0,0 +1,41 @@
+#include "CacheTable.h"
+#include "OffloadTypes.h"
+#include <stdio.h>
+
+/* struct MessageHeader {
+    bool OffloadedToDPU;
+    bool LastMessage;
+    int MessageSize;
+    long long TimeSend;
+};
+
+void OffloadPred(
+    void* Msg,
+    uint16_t Bytes,
+    CacheTableT* CacheTable,
+    RequestDescriptorT* ReqsForHost,
+    RequestDescriptorT* ReqsForDPU,
+    uint8_t* NumReqsForHost,
+    uint8_t* NumReqsForDPU
+) {
+    *NumReqsForHost = 1;
+    *NumReqsForDPU = 0;
+    ReqsForHost[0].Offset = 0;
+    ReqsForHost[0].Bytes = Bytes;
+} */
+
+void OffloadPred(
+    void* Msg,
+    uint16_t Bytes,
+    CacheTableT* CacheTable,
+    RequestDescriptorT* ReqsForHost,
+    RequestDescriptorT* ReqsForDPU,
+    uint8_t* NumReqsForHost,
+    uint8_t* NumReqsForDPU
+) {
+    *NumReqsForHost = 0;
+    *NumReqsForDPU = 1;
+    ReqsForDPU[0].Offset = 0;
+    ReqsForDPU[0].Bytes = Bytes;
+    printf("offload pred got msg, bytes: %hu\n", Bytes);
+}