github/concrete
1
1
Fork 0
mirror of https://github.com/zama-ai/concrete.git synced 2026-02-10 12:44:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleanup(dfr): remove unused key ids and unranked memref labels.

Browse Source
This commit is contained in:
Antoniu Pop
2022-08-04 08:43:27 +01:00
committed by Antoniu Pop
parent abff4e1c17
commit 20d19c2161
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/include/concretelang/Runtime/DFRuntime.hpp
View File

@@ -28,8 +28,7 @@ bool _dfr_use_omp();
typedef enum _dfr_task_arg_type {
_DFR_TASK_ARG_BASE = 0,
_DFR_TASK_ARG_MEMREF = 1,
_DFR_TASK_ARG_UNRANKED_MEMREF = 2,
_DFR_TASK_ARG_CONTEXT = 3
_DFR_TASK_ARG_CONTEXT = 2
} _dfr_task_arg_type;
static inline _dfr_task_arg_type _dfr_get_arg_type(uint64_t val) {

17
compiler/include/concretelang/Runtime/distributed_generic_task_server.hpp
View File

@@ -74,15 +74,14 @@ struct OpaqueInputData {
param_sizes(std::move(_param_sizes)),
param_types(std::move(_param_types)),
output_sizes(std::move(_output_sizes)),
output_types(std::move(_output_types)), ksk_id(0), bsk_id(0) {}
output_types(std::move(_output_types)) {}
OpaqueInputData(const OpaqueInputData &oid)
: wfn_name(std::move(oid.wfn_name)), params(std::move(oid.params)),
param_sizes(std::move(oid.param_sizes)),
param_types(std::move(oid.param_types)),
output_sizes(std::move(oid.output_sizes)),
output_types(std::move(oid.output_types)), ksk_id(oid.ksk_id),
bsk_id(oid.bsk_id) {}
output_types(std::move(oid.output_types)) {}
friend class hpx::serialization::access;
template <class Archive> void load(Archive &ar, const unsigned int version) {
@@ -91,7 +90,8 @@ struct OpaqueInputData {
ar >> output_sizes >> output_types;
for (size_t p = 0; p < param_sizes.size(); ++p) {
char *param;
_dfr_checked_aligned_alloc((void **)&param, 64, param_sizes[p]);
_dfr_checked_aligned_alloc((void **)&param, sizeof(void *),
param_sizes[p]);
ar >> hpx::serialization::make_array(param, param_sizes[p]);
params.push_back((void *)param);
@@ -123,7 +123,6 @@ struct OpaqueInputData {
params[p] =
(void *)_dfr_node_level_runtime_context_manager->getContext();
} break;
case _DFR_TASK_ARG_UNRANKED_MEMREF:
default:
HPX_THROW_EXCEPTION(hpx::no_success, "DFR: OpaqueInputData save",
"Error: invalid task argument type.");
@@ -157,7 +156,6 @@ struct OpaqueInputData {
// Nothing to do now - TODO: pass key ids if these are not
// unique for a computation.
} break;
case _DFR_TASK_ARG_UNRANKED_MEMREF:
default:
HPX_THROW_EXCEPTION(hpx::no_success, "DFR: OpaqueInputData save",
"Error: invalid task argument type.");
@@ -172,8 +170,6 @@ struct OpaqueInputData {
std::vector<uint64_t> param_types;
std::vector<size_t> output_sizes;
std::vector<uint64_t> output_types;
uint64_t ksk_id;
uint64_t bsk_id;
};
struct OpaqueOutputData {
@@ -193,7 +189,8 @@ struct OpaqueOutputData {
ar >> output_sizes >> output_types;
for (size_t p = 0; p < output_sizes.size(); ++p) {
char *output;
_dfr_checked_aligned_alloc((void **)&output, 64, (output_sizes[p]));
_dfr_checked_aligned_alloc((void **)&output, sizeof(void *),
(output_sizes[p]));
ar >> hpx::serialization::make_array(output, output_sizes[p]);
outputs.push_back((void *)output);
@@ -221,7 +218,6 @@ struct OpaqueOutputData {
case _DFR_TASK_ARG_CONTEXT: {
} break;
case _DFR_TASK_ARG_UNRANKED_MEMREF:
default:
HPX_THROW_EXCEPTION(hpx::no_success, "DFR: OpaqueInputData save",
"Error: invalid task argument type.");
@@ -251,7 +247,6 @@ struct OpaqueOutputData {
case _DFR_TASK_ARG_CONTEXT: {
} break;
case _DFR_TASK_ARG_UNRANKED_MEMREF:
default:
HPX_THROW_EXCEPTION(hpx::no_success, "DFR: OpaqueInputData save",
"Error: invalid task argument type.");

9
compiler/lib/Dialect/RT/Analysis/LowerDataflowTasksToRT.cpp
View File

@@ -171,13 +171,8 @@ getSizeInBytes(Value val, Location loc, OpBuilder builder) {
// Unranked memrefs should be lowered to just pointer + size, so we need 16
// bytes.
if (type.isa<mlir::UnrankedMemRefType>()) {
Value arg_type = builder.create<arith::ConstantOp>(
loc, builder.getI64IntegerAttr(dfr::_DFR_TASK_ARG_UNRANKED_MEMREF));
Value result =
builder.create<arith::ConstantOp>(loc, builder.getI64IntegerAttr(16));
return std::pair<mlir::Value, mlir::Value>(result, arg_type);
}
assert(!type.isa<mlir::UnrankedMemRefType>() &&
"UnrankedMemRefType not currently supported");
Value arg_type = builder.create<arith::ConstantOp>(
loc, builder.getI64IntegerAttr(dfr::_DFR_TASK_ARG_BASE));