Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/openfpga
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 210bd5bf9fe3
Choose a base ref
...
head repository: azonenberg/openfpga
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 83d0d1534c03
Choose a head ref
  • 6 commits
  • 11 files changed
  • 1 contributor

Commits on Jun 1, 2017

  1. Copy the full SHA
    fd146b7 View commit details
  2. Copy the full SHA
    408f4fa View commit details
  3. Copy the full SHA
    0261e03 View commit details
  4. Refactoring: Renamed knapsack solver to reflect the fact that it's no…

    …w a general linear solver
    azonenberg committed Jun 1, 2017
    Copy the full SHA
    d63f47d View commit details

Commits on Jun 2, 2017

  1. Solver: Fixed bug where negative coefficients were treated as zero, c…

    …ausing system to be falsely reported unsolvable
    azonenberg committed Jun 2, 2017
    Copy the full SHA
    a8569f6 View commit details
  2. Copy the full SHA
    83d0d15 View commit details
2 changes: 1 addition & 1 deletion src/gp4tchar/TimingData.cpp
Original file line number Diff line number Diff line change
@@ -26,5 +26,5 @@ using namespace std;
DevkitCalibration::DevkitCalibration()
{
for(int i=0; i<=20; i++)
pinDelays[i] = DelayPair(0, -1);
pinDelays[i] = CombinatorialDelay(0, -1);
}
28 changes: 6 additions & 22 deletions src/gp4tchar/TimingData.h
Original file line number Diff line number Diff line change
@@ -19,35 +19,17 @@
#ifndef TimingData_h
#define TimingData_h

//Delay values
class DelayPair
{
public:
DelayPair(float r = 0, float f = 0)
: rising(r)
, falling(f)
{ }

float rising;
float falling;
};
#include "../xbpar/CombinatorialDelay.h"

//Devkit calibration
class DevkitCalibration
{
public:
DevkitCalibration();

DelayPair pinDelays[21]; //0 is unused so we can use 1-based pin numbering like the chip does
//For now, only pins 3-4-5 and 13-14-15 are used
};

//Propagation delay through a cell (only one output supported for now)
class CellDelay
{
public:
//map from pin name to delay
std::map<std::string, DelayPair> delays;
//Delays from FPGA to DUT pins
CombinatorialDelay pinDelays[21]; //0 is unused so we can use 1-based pin numbering like the chip does
//For now, only pins 3-4-5 and 13-14-15 are used
};

//DUT measurements
@@ -56,11 +38,13 @@ class DeviceProperties
{
public:

/*
//Map from (src, dst) pin to delay tuple
typedef std::map<PinPair, DelayPair> IODelayMap;
//Map from drive strength to delay tuples
std::map<Greenpak4IOB::DriveStrength, IODelayMap> ioDelays;
*/
};

/*
3 changes: 2 additions & 1 deletion src/gp4tchar/main.cpp
Original file line number Diff line number Diff line change
@@ -124,10 +124,11 @@ int main(int argc, char* argv[])
//Measure delay through each element
if(!MeasurePinToPinDelays(sock, hdev))
return 1;

/*
if(!MeasureCrossConnectionDelays(sock, hdev))
return 1;
*/
/*
if(!MeasureLutDelays(sock, hdev))
return 1;
*/
Loading