17938601462

Committed 23 Sep 2025 07:17AM UTC coverage: 61.149% (-0.02%) from 61.165%

Build # 17938601462

Build Type

Pull #238

github

Committed by

web-flow

Commit Message

Merge 703773d84 into acf2a7a40

Pull Request Pull Request #238: Fix arg capturing

Run Details

10 of 11 new or added lines in 1 file covered. (90.91%)

5 existing lines in 2 files now uncovered.

9513 of 15557 relevant lines covered (61.15%)

108.76 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

58.88

/src/codegen/code_generator.cpp

#include "sdfg/codegen/code_generator.h"
#include <symengine/constants.h>
#include <symengine/dict.h>
#include <symengine/number.h>
#include "sdfg/analysis/analysis.h"
#include "sdfg/analysis/mem_access_range_analysis.h"
#include "sdfg/analysis/type_analysis.h"
#include "sdfg/codegen/instrumentation/capture_var_plan.h"
#include "sdfg/symbolic/symbolic.h"
#include "sdfg/types/structure.h"

namespace sdfg {
namespace codegen {

std::tuple<int, types::PrimitiveType> CodeGenerator::analyze_type_rec(
    symbolic::Expression* dims,
    int maxDim,
    int dimIdx,
    const types::IType& type,
    int argIdx,
    const analysis::MemAccessRange* range,
    analysis::AnalysisManager& analysis_manager,
    const StructuredSDFG& sdfg,
    std::string var_name
) {
    if (dimIdx > maxDim) {
        std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << ": data nesting deeper than " << maxDim
                  << ", ignoring" << std::endl;
        return std::make_tuple(-1, types::Void);
    }

    if (auto* scalarType = dynamic_cast<const types::Scalar*>(&type)) {
        return std::make_tuple(dimIdx, scalarType->primitive_type());
    } else if (auto structureType = dynamic_cast<const sdfg::types::Structure*>(&type)) {
        return std::make_tuple(dimIdx, types::Void);
    } else if (auto* arrayType = dynamic_cast<const types::Array*>(&type)) {
        dims[dimIdx] = arrayType->num_elements();
        auto& inner = arrayType->element_type();

        return analyze_type_rec(dims, maxDim, dimIdx + 1, inner, argIdx, range, analysis_manager, sdfg, var_name);
    } else if (auto* ptrType = dynamic_cast<const types::Pointer*>(&type)) {
        if (range && !range->is_undefined()) {
            const auto& dim = range->dims()[dimIdx];

            if (symbolic::eq(symbolic::zero(), dim.first)) {
                dims[dimIdx] = symbolic::add(dim.second, symbolic::one());
                const types::IType* inner = nullptr;
                if (ptrType->has_pointee_type()) {
                    inner = &(ptrType->pointee_type());
                } else {
                    if (dimIdx > 0) {
                        std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx
                                  << ": missing pointee type for dim > 0, cannot capture!" << std::endl;
                        return std::make_tuple(-2, types::Void);
                    } else {
                        auto& type_analysis = analysis_manager.get<analysis::TypeAnalysis>();
                        auto outer = type_analysis.get_outer_type(var_name);
                        if (outer != nullptr) {
                            if (auto* ptrType_new = dynamic_cast<const types::Pointer*>(outer)) {
                                if (ptrType_new->has_pointee_type()) {
                                    inner = &(ptrType_new->pointee_type());
                                } else {
                                    std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx
                                              << ": missing pointee type, cannot capture!" << std::endl;
                                    return std::make_tuple(-2, types::Void);
                                }
                            }
                        } else {
                            std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx
                                      << ": could not infer type from container, cannot capture!" << std::endl;
                            return std::make_tuple(-2, types::Void);
                        }
                    }
                    if (inner == nullptr) {
                        std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx
                                  << ": could not infer type from container, cannot capture!" << std::endl;
                        return std::make_tuple(-2, types::Void);
                    }
                }

                return analyze_type_rec(dims, maxDim, dimIdx + 1, *inner, argIdx, range, analysis_manager, sdfg, var_name);
            } else {
                std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx << ": has upper bound "
                          << dim.second->__str__() << ", but does not start at 0, cannot capture" << std::endl;
                return std::make_tuple(-2, types::Void);
            }
        } else {
            std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx
                      << ": missing range, cannot capture!" << std::endl;
            return std::make_tuple(-2, types::Void);
        }
    } else {
        std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << ": unsupported type " << type.print()
                  << ", cannot capture!" << std::endl;
        return std::make_tuple(-1, types::Void);
    }
}

bool CodeGenerator::add_capture_plan(
    const std::string& varName,
    int argIdx,
    bool isExternal,
    std::vector<CaptureVarPlan>& plan,
    const analysis::MemAccessRanges& ranges
) {
    const types::IType* type = nullptr;
    if (isExternal) {
        auto& pointer_type = dynamic_cast<const types::Pointer&>(sdfg_.type(varName));
        assert(pointer_type.has_pointee_type() && "Externals must have a pointee type");
        type = &pointer_type.pointee_type();
    } else {
        type = &sdfg_.type(varName);
    }

    const auto* range = ranges.get(varName);

    analysis::AnalysisManager analysis_manager(sdfg_);

    symbolic::Expression dims[3];

    int dimCount = 0;
    types::PrimitiveType innerPrim;

    std::tie(dimCount, innerPrim) =
        analyze_type_rec(dims, 3, 0, *type, argIdx, range, analysis_manager, sdfg_, varName);

    bool isRead = range ? range->saw_read() : true;
    bool isWritten = range ? range->saw_write() : true;

    if (dimCount == 0) {
        plan.emplace_back(isRead, false, CaptureVarType::CapRaw, argIdx, isExternal, innerPrim);
    } else if (dimCount == 1) {
        plan.emplace_back(isRead, isWritten, CaptureVarType::Cap1D, argIdx, isExternal, innerPrim, dims[0]);
    } else if (dimCount == 2) {
        plan.emplace_back(isRead, isWritten, CaptureVarType::Cap2D, argIdx, isExternal, innerPrim, dims[0], dims[1]);
    } else if (dimCount == 3) {
        plan.emplace_back(
            isRead, isWritten, CaptureVarType::Cap3D, argIdx, isExternal, innerPrim, dims[0], dims[1], dims[2]
        );
    } else {
        return false;
    }

    return true;
}

std::unique_ptr<std::vector<CaptureVarPlan>> CodeGenerator::create_capture_plans() {
    auto name = sdfg_.name();

    analysis::AnalysisManager analysis_manager(sdfg_);
    const auto& args = sdfg_.arguments();
    auto& exts = sdfg_.externals();
    const auto& ranges = analysis_manager.get<analysis::MemAccessRanges>();

    auto plan = std::make_unique<std::vector<CaptureVarPlan>>();

    bool working = true;

    int argIdx = -1;
    for (auto& argName : args) {
        ++argIdx;

        working &= add_capture_plan(argName, argIdx, false, *plan.get(), ranges);
    }

    for (auto& argName : exts) {
        if (sdfg_.type(argName).type_id() == types::TypeID::Function) {
            continue;
        }
        ++argIdx;

        working &= add_capture_plan(argName, argIdx, true, *plan.get(), ranges);
    }

    if (!working) {
        std::cerr << "In '" << name << "': could not create capture plan, returning empty plan" << std::endl;
        return std::make_unique<std::vector<CaptureVarPlan>>();
    }

    return plan;
}

} // namespace codegen
} // namespace sdfg

1	#include "sdfg/codegen/code_generator.h"
2	#include <symengine/constants.h>
3	#include <symengine/dict.h>
4	#include <symengine/number.h>
5	#include "sdfg/analysis/analysis.h"
6	#include "sdfg/analysis/mem_access_range_analysis.h"
7	#include "sdfg/analysis/type_analysis.h"
8	#include "sdfg/codegen/instrumentation/capture_var_plan.h"
9	#include "sdfg/symbolic/symbolic.h"
10	#include "sdfg/types/structure.h"
11
12	namespace sdfg {
13	namespace codegen {
14
15	std::tuple<int, types::PrimitiveType> CodeGenerator::analyze_type_rec(	5✔
16	symbolic::Expression* dims,
17	int maxDim,
18	int dimIdx,
19	const types::IType& type,
20	int argIdx,
21	const analysis::MemAccessRange* range,
22	analysis::AnalysisManager& analysis_manager,
23	const StructuredSDFG& sdfg,
24	std::string var_name
25	) {
26	if (dimIdx > maxDim) {	5✔
27	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << ": data nesting deeper than " << maxDim	×
28	<< ", ignoring" << std::endl;	×
29	return std::make_tuple(-1, types::Void);	×
30	}
31
32	if (auto* scalarType = dynamic_cast<const types::Scalar*>(&type)) {	5✔
33	return std::make_tuple(dimIdx, scalarType->primitive_type());	3✔
34	} else if (auto structureType = dynamic_cast<const sdfg::types::Structure*>(&type)) {	2✔
35	return std::make_tuple(dimIdx, types::Void);	×
36	} else if (auto* arrayType = dynamic_cast<const types::Array*>(&type)) {	2✔
37	dims[dimIdx] = arrayType->num_elements();	1✔
38	auto& inner = arrayType->element_type();	1✔
39
40	return analyze_type_rec(dims, maxDim, dimIdx + 1, inner, argIdx, range, analysis_manager, sdfg, var_name);	1✔
41	} else if (auto* ptrType = dynamic_cast<const types::Pointer*>(&type)) {	1✔
42	if (range && !range->is_undefined()) {	1✔
43	const auto& dim = range->dims()[dimIdx];	1✔
44
45	if (symbolic::eq(symbolic::zero(), dim.first)) {	1✔
46	dims[dimIdx] = symbolic::add(dim.second, symbolic::one());	1✔
47	const types::IType* inner = nullptr;	1✔
48	if (ptrType->has_pointee_type()) {	1✔
49	inner = &(ptrType->pointee_type());	1✔
50	} else {	1✔
51	if (dimIdx > 0) {	×
52	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx	×
53	<< ": missing pointee type for dim > 0, cannot capture!" << std::endl;	×
54	return std::make_tuple(-2, types::Void);	×
55	} else {
56	auto& type_analysis = analysis_manager.get<analysis::TypeAnalysis>();	×
57	auto outer = type_analysis.get_outer_type(var_name);	×
58	if (outer != nullptr) {	×
59	if (auto* ptrType_new = dynamic_cast<const types::Pointer*>(outer)) {	×
60	if (ptrType_new->has_pointee_type()) {	×
61	inner = &(ptrType_new->pointee_type());	×
62	} else {	×
63	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx	×
64	<< ": missing pointee type, cannot capture!" << std::endl;	×
65	return std::make_tuple(-2, types::Void);	×
66	}
67	}	×
68	} else {	×
69	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx	×
70	<< ": could not infer type from container, cannot capture!" << std::endl;	×
71	return std::make_tuple(-2, types::Void);	×
72	}
73	}
74	if (inner == nullptr) {	×
75	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx	×
76	<< ": could not infer type from container, cannot capture!" << std::endl;	×
77	return std::make_tuple(-2, types::Void);	×
78	}
79	}
80
81	return analyze_type_rec(dims, maxDim, dimIdx + 1, *inner, argIdx, range, analysis_manager, sdfg, var_name);	1✔
82	} else {
83	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx << ": has upper bound "	×
84	<< dim.second->__str__() << ", but does not start at 0, cannot capture" << std::endl;	×
85	return std::make_tuple(-2, types::Void);	×
86	}
87	} else {
88	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << " dim" << dimIdx	×
89	<< ": missing range, cannot capture!" << std::endl;	×
90	return std::make_tuple(-2, types::Void);	×
91	}
92	} else {
93	std::cerr << "In '" << sdfg_.name() << "', arg" << argIdx << ": unsupported type " << type.print()	×
94	<< ", cannot capture!" << std::endl;	×
95	return std::make_tuple(-1, types::Void);	×
96	}
97	}	5✔
98
99	bool CodeGenerator::add_capture_plan(	3✔
100	const std::string& varName,
101	int argIdx,
102	bool isExternal,
103	std::vector<CaptureVarPlan>& plan,
104	const analysis::MemAccessRanges& ranges
105	) {
106	const types::IType* type = nullptr;	3✔
107	if (isExternal) {	3✔
108	auto& pointer_type = dynamic_cast<const types::Pointer&>(sdfg_.type(varName));	1✔
109	assert(pointer_type.has_pointee_type() && "Externals must have a pointee type");	2✔
110	type = &pointer_type.pointee_type();	1✔
111	} else {	1✔
112	type = &sdfg_.type(varName);	2✔
113	}
114
115	const auto* range = ranges.get(varName);	3✔
116
117	analysis::AnalysisManager analysis_manager(sdfg_);	3✔
118
119	symbolic::Expression dims[3];	9✔
120
121	int dimCount = 0;	3✔
122	types::PrimitiveType innerPrim;
123
124	std::tie(dimCount, innerPrim) =	3✔
125	analyze_type_rec(dims, 3, 0, *type, argIdx, range, analysis_manager, sdfg_, varName);	3✔
126
127	bool isRead = range ? range->saw_read() : true;	3✔
128	bool isWritten = range ? range->saw_write() : true;	3✔
129
130	if (dimCount == 0) {	3✔
131	plan.emplace_back(isRead, false, CaptureVarType::CapRaw, argIdx, isExternal, innerPrim);	2✔
132	} else if (dimCount == 1) {	3✔
UNCOV 133	plan.emplace_back(isRead, isWritten, CaptureVarType::Cap1D, argIdx, isExternal, innerPrim, dims[0]);	×
134	} else if (dimCount == 2) {	1✔
135	plan.emplace_back(isRead, isWritten, CaptureVarType::Cap2D, argIdx, isExternal, innerPrim, dims[0], dims[1]);	1✔
136	} else if (dimCount == 3) {	1✔
137	plan.emplace_back(	×
138	isRead, isWritten, CaptureVarType::Cap3D, argIdx, isExternal, innerPrim, dims[0], dims[1], dims[2]	×
139	);
140	} else {	×
141	return false;	×
142	}
143
144	return true;	3✔
145	}	3✔
146
147	std::unique_ptr<std::vector<CaptureVarPlan>> CodeGenerator::create_capture_plans() {	1✔
148	auto name = sdfg_.name();	1✔
149
150	analysis::AnalysisManager analysis_manager(sdfg_);	1✔
151	const auto& args = sdfg_.arguments();	1✔
152	auto& exts = sdfg_.externals();	1✔
153	const auto& ranges = analysis_manager.get<analysis::MemAccessRanges>();	1✔
154
155	auto plan = std::make_unique<std::vector<CaptureVarPlan>>();	1✔
156
157	bool working = true;	1✔
158
159	int argIdx = -1;	1✔
160	for (auto& argName : args) {	3✔
161	++argIdx;	2✔
162
163	working &= add_capture_plan(argName, argIdx, false, *plan.get(), ranges);	2✔
164	}
165
166	for (auto& argName : exts) {	2✔
167	if (sdfg_.type(argName).type_id() == types::TypeID::Function) {	1✔
NEW 168	continue;	×
169	}
170	++argIdx;	1✔
171
172	working &= add_capture_plan(argName, argIdx, true, *plan.get(), ranges);	1✔
173	}
174
175	if (!working) {	1✔
176	std::cerr << "In '" << name << "': could not create capture plan, returning empty plan" << std::endl;	×
177	return std::make_unique<std::vector<CaptureVarPlan>>();	×
178	}
179
180	return plan;	1✔
181	}	1✔
182
183	} // namespace codegen
184	} // namespace sdfg

daisytuner / sdfglib / 17938601462

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous